Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into Inst…
Browse files Browse the repository at this point in the history
…ancingOption

# Conflicts:
#	src/DynamoCoreWpf/Properties/Resources.en-US.resx
#	src/DynamoCoreWpf/Properties/Resources.resx
  • Loading branch information
saintentropy committed Dec 2, 2023
2 parents c0507c7 + c9c76aa commit db36468
Show file tree
Hide file tree
Showing 593 changed files with 96,334 additions and 7,724 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Build Dynamo using latest VS and DotNET
name: DynamoAllNet6.0-Build
# Build DynamoAll.sln with .NET 6.0
name: Build DynamoAll.sln net6.0

on: [push,pull_request]

jobs:
build:
runs-on: windows-latest
Expand All @@ -19,7 +21,7 @@ jobs:

- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo with MSBuild for Windows
run: |
echo "***Continue with the build, Good luck developer!***"
Expand All @@ -31,10 +33,21 @@ jobs:
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
- name: Upload Artifact
- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: DynamoSandbox
path: ${{ github.workspace }}\Dynamo\bin\AnyCPU\Release
if-no-files-found: warn
retention-days: 3
- name: Save Pull Request Number
env:
PR_NUMBER: ${{ github.event.number }}
run: $PR_NUMBER | Out-File -FilePath pr_number.txt
- name: Upload Pull Request Artifact
uses: actions/upload-artifact@v3
with:
name: pr_number
path: ${{ github.workspace }}\pr_number.txt
if-no-files-found: warn
retention-days: 3
53 changes: 53 additions & 0 deletions .github/workflows/build_dynamo_all_net8.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Build DynamoAll.sln with .NET 8.0
name: Build DynamoAll.sln net8.0

on: [push,pull_request]

jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Disable problem matcher
run: echo "::remove-matcher owner=csc::"

- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64 -p:DotNet=net8.0
- name: Build Dynamo 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\Dynamo\src\Dynamo.All.sln /p:Configuration=Release /p:DotNet=net8.0
# look for Dynamo
- name: Navigate to Dynamo Windows Folder
run: |
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
- name: Upload Build Artifact
uses: actions/upload-artifact@v3
with:
name: DynamoSandbox
path: ${{ github.workspace }}\Dynamo\bin\AnyCPU\Release
if-no-files-found: warn
retention-days: 3
- name: Save Pull Request Number
env:
PR_NUMBER: ${{ github.event.number }}
run: $PR_NUMBER | Out-File -FilePath pr_number.txt
- name: Upload Pull Request Artifact
uses: actions/upload-artifact@v3
with:
name: pr_number
path: ${{ github.workspace }}\pr_number.txt
if-no-files-found: warn
retention-days: 3
9 changes: 5 additions & 4 deletions .github/workflows/close_stale_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
days-before-close: 0
only-labels: needs more info
close-issue-message: Given that there has been no additional information added, this issue will be closed for now. Please reopen and provide additional information if you wish the Dynamo team to investigate further.
- name: Summary
- name: Summary # Print markdown list of closed issues or "No Issues" message if no issues were closed
env:
ISSUES_URL: ${{ format('{0}/{1}/issues', github.server_url, github.repository) }}
run: |
echo "# Closed Issues" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "${{ steps.close_issues.outputs.closed-issues-prs }}" >> $GITHUB_STEP_SUMMARY
echo '# Closed Issues' >> $GITHUB_STEP_SUMMARY
echo '${{ steps.close_issues.outputs.closed-issues-prs }}' | jq --raw-output 'if (. == []) then "- No Issues." else .[] | "- \(.title) - [#\(.number)](\(env.ISSUES_URL)/\(.number))" end' >> $GITHUB_STEP_SUMMARY
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- name: Install dependencies for windows runtime
run: dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln --runtime=win10-x64
run: dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln --runtime=win-x64
- name: Build Dynamo with MSBuild for Windows
run: |
echo "***Continue with the build, Good luck developer!***"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dynamoBinDiff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: echo "::remove-matcher owner=csc::"
- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
dotnet restore $Env:GITHUB_WORKSPACE\net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo current branch with MSBuild for NET60-Windows
run: |
echo "***Continue with the build, Good luck developer!***"
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
run: echo "::remove-matcher owner=csc::"
- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
dotnet restore $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo master branch with MSBuild for NET60-Windows
run: |
echo "***Continue with the build, Good luck developer!***"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dynamoNet6.0_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Install dependencies for windows runtime
run: |
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win10-x64
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo with MSBuild for Windows
run: |
echo "***Continue with the build, Good luck developer!***"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v4.1.0
uses: metcalfc/changelog-generator@v4.2.0
with:
myToken: ${{ secrets.GITHUB_TOKEN }}
head-ref: ${{ github.event.inputs.head-ref }}
Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/test.yml

This file was deleted.

74 changes: 74 additions & 0 deletions .github/workflows/ui_smoke_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: UI Smoke Tests

on:
workflow_run:
workflows:
- Build DynamoAll.sln net6.0
- Build DynamoAll.sln net8.0
types:
- completed

env:
TEST_EXECUTE_DOWNLOAD_URL: https://downloads.smartbear.com/TestExecute1552SLM.exe
ACTOR: ${{ github.actor }}
WORKFLOW_ID: ${{ github.event.workflow_run.workflow_id }}
RUN_ID: ${{ github.event.workflow_run.id }}
RUN_NAME: ${{ github.event.workflow_run.name }}
RUN_URL: ${{ github.event.workflow_run.html_url }}

jobs:
ui_smoke_tests:
name: UI Smoke Tests
timeout-minutes: 60
runs-on: windows-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
repository: DynamoDS/DynamoTestCompleteTests
token: ${{ secrets.DYNAMO_TESTS_TOKEN }}
ref: master
- name: Download TestExecute
run: Invoke-WebRequest -Uri "${{ env.TEST_EXECUTE_DOWNLOAD_URL }}" -OutFile ".\TE.exe"
- name: Install TestExecute
shell: cmd
run: .\TE.exe -SilentInstall
- name: Download Build Artifact
uses: dawidd6/action-download-artifact@v2
with:
name: DynamoSandbox
workflow: ${{ env.WORKFLOW_ID }}
run_id: ${{ env.RUN_ID }}
path: ${{ github.workspace }}\build
- name: Download Pull Request Artifact
uses: dawidd6/action-download-artifact@v2
with:
name: pr_number
workflow: ${{ env.WORKFLOW_ID }}
run_id: ${{ env.RUN_ID }}
path: ${{ github.workspace }}\pr
- name: Run UI Smoke Tests
shell: cmd
run: .github\scripts\run_tests.bat ${{ secrets.TEST_EXECUTE_ACCESS_KEY }} Dynamo\Dynamo.pjs DynamoSandbox SmokeTests
- name: UI Smoke Tests Report
uses: dorny/[email protected]
if: always()
with:
name: UI Smoke Test Report
path: reports/report.xml
reporter: java-junit
- name: Read Pull Request Number
id: read_pr_number
run: |
"pr_number=$(Get-Content ${{ github.workspace }}\pr\pr_number.txt)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
- name: Summary
env:
PR_NUMBER: ${{ steps.read_pr_number.outputs.pr_number }}
PR_URL: ${{ format('{0}/{1}/pull', github.server_url, github.repository) }}
if: always()
run: |
Get-Content summary.md | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
"Actor: @$env:ACTOR" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
"Workflow Run: [$env:RUN_NAME]($env:RUN_URL)" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
"Pull Request: [$env:PR_NUMBER]($env:PR_URL/$env:PR_NUMBER)" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
12 changes: 12 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<PropertyGroup>
<!--
SolutionDir is mostly useful for running the dotnet list package command
Ex. of generating report of all transitive nuget dependencies in powershell:
(dotnet list $pwd\Dynamo.All.sln package - -include-transitive
Ex. of generating report of unique transitive nuget dependencies in powershell:
(dotnet list $pwd\Dynamo.All.sln package - -include-transitive) -match '^.*>' -replace '^ +> ','' -replace '\s+', ' ' | % { $_.Trim() } | % { [string]::Format("{0} {1}",$_.split(" ")[0],$_.split(" ")[1])} | Sort-Object -Unique
Note: The - -include-transitive should have a double dash without a space in between. -->
<SolutionDir>$(MSBuildThisFileDirectory)src\</SolutionDir>
</PropertyGroup>
</Project>
36 changes: 29 additions & 7 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,35 @@ Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)

In the Font Awesome Free download, the CC BY 4.0 license applies to all icons packaged as SVG and JS file types.

Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/): The Font Awesome Free download is licensed under a Creative Commons Attribution 4.0 International License and applies to all icons packaged as SVG and JS file types.

Fonts: SIL OFL 1.1 License
In the Font Awesome Free download, the SIL OFL license applies to all icons packaged as web and desktop font files.
Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
with Reserved Font Name: "Font Awesome".
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license can be found at: http://scripts.sil.org/OFL

Code: MIT License (https://opensource.org/licenses/MIT)
In the Font Awesome Free download, the MIT license applies to all non-font and
non-icon files.
Copyright 2023 Fonticons, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in the
Software without restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so, subject to the
following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


Cyotek.Drawing.BitmapFont v.2.0.0:
https://github.com/cyotek/Cyotek.Drawing.BitmapFont
https://github.com/cyotek/Cyotek.Drawing.BitmapFont/blob/master/LICENSE.txt
Expand Down Expand Up @@ -683,13 +712,6 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

SoapFormatter v1.0.11
https://github.com/novotnyllc/SoapFormatter/blob/main/LICENSE

In general, the runtime and its class libraries are licensed under the
terms of the MIT license, and some third party code is licensed under
the 3-clause BSD license. See the file "PATENTS.TXT" for Microsoft's
patent grant on the Mono codebase.

coverlet.collector v.3.1.2
The MIT License (MIT)
Expand Down
Loading

0 comments on commit db36468

Please sign in to comment.