Skip to content

Commit

Permalink
Merge branch 'master' into DYN-5895
Browse files Browse the repository at this point in the history
  • Loading branch information
saintentropy committed Oct 5, 2023
2 parents cdffedb + b5d9ffd commit 128d133
Show file tree
Hide file tree
Showing 41 changed files with 238 additions and 361 deletions.
12 changes: 6 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!--
Please Note:
1. Before submitting the PR, please review [How to Contribute to Dynamo](https://github.com/DynamoDS/Dynamo/blob/master/CONTRIBUTING.md)
2. Dynamo Team will meet 1x a month to review PRs found on Github (Issues will be handled separately)
Expand All @@ -6,11 +7,11 @@ Please Note:
5. PRs should use either Dynamo's default PR template or [one of these other template options](https://github.com/DynamoDS/Dynamo/wiki/Choosing-a-Pull-Request-Template) in order to be considered for review.
6. PRs that do not have one of the Dynamo PR templates completely filled out with all declarations satisfied will not be reviewed by the Dynamo team.
7. PRs made to the `DynamoRevit` repo will need to be cherry-picked into all the DynamoRevit Release branches that Dynamo supports. Contributors will be responsible for cherry-picking their reviewed commits to the other branches after a `LGTM` label is added to the PR.
-->

### Purpose

(FILL ME IN) This section describes why this PR is here. Usually it would include a reference
to the tracking task that it is part or all of the solution for.
(FILL ME IN) This section describes why this PR is here. Usually it would include a reference to the tracking task that it is part or all of the solution for.

### Declarations

Expand All @@ -24,16 +25,15 @@ Check these if you believe they are true
- [ ] Snapshot of UI changes, if any.
- [ ] Changes to the API follow [Semantic Versioning](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-Versions) and are documented in the [API Changes](https://github.com/DynamoDS/Dynamo/wiki/API-Changes) document.
- [ ] This PR modifies some build requirements and the readme is updated
- [ ] This PR contains no files larger than 50 MB
- [ ] This PR contains no files larger than 50 MB

### Release Notes

(FILL ME IN) Brief description of the fix / enhancement. **Mandatory section**

(FILL ME IN) Brief description of the fix / enhancement. **Mandatory section**

### Reviewers

(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR)
(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR)

(FILL ME IN, optional) Any additional notes to reviewers or testers.

Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
directory: ".github/workflows"
schedule:
interval: "weekly"
4 changes: 2 additions & 2 deletions .github/workflows/Issues_workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
outputs:
result: ${{env.content_analysis_response}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

#Detect if the issue_title follows the regex expression
- name: Check Issue Title
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
acceptable_missing_info: 1
steps:
#Checkout the repo
- uses: actions/checkout@v3
- uses: actions/checkout@v4

#Removes conflicting characters before using the issue content as a script parameter
- name: Remove conflicting chars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PR_merged.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Getting PR information from the commit SHA
- name: Getting PR information
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_file_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Get changed files
id: get_changed_files
uses: tj-actions/changed-files@v35
uses: tj-actions/changed-files@v39
- name: Check file size
run: |
for file in ${{ steps.get_changed_files.outputs.all_changed_files }}; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close_stale_issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: close stale issues
uses: actions/stale@v3
uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
#By default the action will leave a message when marking the issue as stale and another-one when closing the issue.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dynamoAllNet6.0_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dynamoBinDiff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: net60_Win_Dynamo
repository: DynamoDS/Dynamo
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
path: master_net60_Win_Dynamo
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 @@ -6,7 +6,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dynamoNet6.0_linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: Dynamo
- name: Setup dotnet
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
steps:
# To use this repository's private action, you must check out the repository
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v1.0.0
uses: metcalfc/changelog-generator@v4.1.0
with:
myToken: ${{ secrets.GITHUB_TOKEN }}
head-ref: ${{ github.event.inputs.head-ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issue_type_predicter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
acceptable_missing_info: 1
steps:
#Removes conflicting characters before using the issue content as a script parameter
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Remove conflicting chars
env:
ISSUE_BODY: ${{github.event.issue.body}}
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
#Now checkout the IssuesTypePredicter source code from the repo https://github.com/DynamoDS/IssuesTypePredicter
- name: Checkout IssuesTypePredicter
if: env.analysis_response == 'Valid'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: DynamoDS/IssuesTypePredicter
path: IssuesTypePredicter
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/move_issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,43 @@ env:
gh_organization: DynamoDS
gh_token: ${{ secrets.DYNAMO_ISSUES_TOKEN }}
project_id: 4
project_name: 'Dynamo Issues'

jobs:
issue_labeled_as_revit:
name: Transfer issue labeled as 'Revit'
runs-on: ubuntu-latest
if: github.event.label.name == 'Revit'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Transfer issue to DynamoRevit Repository
run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoRevit
run: |
gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}"
gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoRevit
env:
GITHUB_TOKEN: ${{ env.gh_token }}
issue_labeled_as_dynamo_advance_steel:
name: Transfer issue labeled as 'Advance-Steel'
runs-on: ubuntu-latest
if: github.event.label.name == 'Advance-Steel'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Transfer issue to Dynamo-Advance-Steel Repository
run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/Dynamo-Advance-Steel
run: |
gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}"
gh issue transfer ${{ github.event.issue.number }} DynamoDS/Dynamo-Advance-Steel
env:
GITHUB_TOKEN: ${{ env.gh_token }}
issue_labeled_as_wishlist:
name: Transfer issue labeled as 'Wishlist'
runs-on: ubuntu-latest
if: github.event.label.name == 'Wishlist'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Transfer issue to DynamoWishlist Repository
run: gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoWishlist
run: |
gh issue edit ${{ github.event.issue.number }} --remove-project "${{ env.project_name }}"
gh issue transfer ${{ github.event.issue.number }} DynamoDS/DynamoWishlist
env:
GITHUB_TOKEN: ${{ env.gh_token }}
issue_labeled_as_tracked:
Expand All @@ -62,7 +69,7 @@ jobs:
if: github.event.label.name == 'tracked'
steps:
- name: Move tracked issue to Todo
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
uses: leonsteinhaeuser/project-beta-automations@v2.2.1
with:
gh_token: ${{ env.gh_token }}
organization: ${{ env.gh_organization }}
Expand Down
27 changes: 17 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
[![Nuget](https://img.shields.io/nuget/v/DynamoVisualProgramming.Core?logo=nuget)](https://www.nuget.org/packages/DynamoVisualProgramming.Core)
[![DynamoVisualProgramming.Core on fuget.org](https://www.fuget.org/packages/DynamoVisualProgramming.Core/badge.svg)](https://www.fuget.org/packages/DynamoVisualProgramming.Core)

![Image](https://raw.github.com/ikeough/Dynamo/master/doc/distrib/Images/dynamo_logo_dark.png)
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/dynamo_logo_light.png">
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/dynamo_logo_dark.png">
<img alt="Dynamo Logo" src="https://raw.githubusercontent.com/DynamoDS/Dynamo/master/doc/distrib/Images/dynamo_logo_dark.png">
</picture>

Dynamo is a visual programming tool that aims to be accessible to both non-programmers and programmers alike. It gives users the ability to visually script behavior, define custom pieces of logic, and script using various textual programming languages.

## Get Dynamo
Expand All @@ -33,21 +38,23 @@ You can learn more about developing libraries for Dynamo on the [Dynamo wiki](ht
You will need the following to build the latest Dynamo on Windows:

- [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) (any edition)
- Microsoft .NET Framework 4.8 (included with Visual Studio 2022)
- Node.js v16 and npm v8
- - [Download](https://nodejs.org/en/download/) and install the latest LTS version of Node.js
- - Open up your Command Prompt and check you have successfully installed Node by inputting `node -v`. If you have Node installed, it will tell you the version.
- [GitHub for Windows](https://windows.github.com/)
- For runnning Dynamo tests within Visual Studio -[NUnit Test Adapter 2](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTestAdapter)
- [Microsoft .NET Framework 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) (included with Visual Studio 2022)
- [Node.js LTS](https://nodejs.org/en/download/) and npm
- [NUnit Test Adapter 2](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTestAdapter) (For runnning Dynamo tests within Visual Studio)

If you are working on legacy branches, you may need to install legacy .NET Framework versions through Visual Studio `Tools > Get Tools and Features...` or downloading from [the archive here](https://www.microsoft.com/net/download/archives).

The Dynamo user interface is Windows-only, but with some extra effort the Dynamo engine can be built for other platforms. [Directions for building Dynamo on Linux or OS X can be found here](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-on-Linux,-Mac).
Find more about how to build Dynamo at our [wiki](https://github.com/DynamoDS/Dynamo/wiki) and [Dynamo Developer Resources](https://developer.dynamobim.org/)
The Dynamo user interface is Windows-only, but the Dynamo engine can be built for other platforms. [Directions for building Dynamo on Linux or OS X can be found here](https://github.com/DynamoDS/Dynamo/wiki/Dynamo-on-Linux,-Mac).
Find more about how to build Dynamo at our [wiki](https://github.com/DynamoDS/Dynamo/wiki) and [Dynamo Developer Resources](https://developer.dynamobim.org/).

## Contribute

Dynamo is an open-source project and would be nothing without its community. You can make suggestions or track and submit bugs via [Github issues](https://github.com/DynamoDS/Dynamo/issues). You can submit your own code to the Dynamo project via a Github [pull request](https://github.com/DynamoDS/Dynamo/blob/master/CONTRIBUTING.md).
Dynamo is an open source project and would be nothing without its community.

- You can make suggestions or improvement requests via [Dynamo Wishlist](https://github.com/DynamoDS/DynamoWishlist/issues/new/choose).
- You can submit and track bugs via [Dynamo Issues](https://github.com/DynamoDS/Dynamo/issues/new/choose).
- You can submit your own code to via a [pull request](https://github.com/DynamoDS/Dynamo/pulls). For more info read [CONTRIBUTING.md](CONTRIBUTING.md).
- If you have any questions, ideas or have something to share with the community, please visit us at [Dynamo Forum](https://forum.dynamobim.com).

## Releases

Expand Down
Binary file added doc/distrib/Images/dynamo_logo_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public partial class DocumentationBrowserView : UserControl, IDisposable

internal string WebBrowserUserDataFolder { get; set; }
internal string FallbackDirectoryName { get; set; }
//This folder will be used to store images and dyn files previosuly located in /rootDirectory/en-US/fallback_docs so we don't need to copy all those files per each language
internal const string SharedDocsDirectoryName = "NodeHelpSharedDocs";

//Path in which the virtual folder for loading images will be created
internal string VirtualFolderPath { get; set; }
Expand Down Expand Up @@ -132,7 +134,11 @@ async void InitializeAsync()
{
if (viewModel.Link != null && !string.IsNullOrEmpty(viewModel.CurrentPackageName))
{
VirtualFolderPath = Path.GetDirectoryName(HttpUtility.UrlDecode(viewModel.Link.AbsolutePath));
var absolutePath = Path.GetDirectoryName(HttpUtility.UrlDecode(viewModel.Link.AbsolutePath));
//We move two levels up so it will be located in same level than the the NodeHelpSharedDocs directory
var imagesLocation = new DirectoryInfo(absolutePath).Parent.Parent.FullName;
//Adds the NodeHelpSharedDocs directory to the path
VirtualFolderPath = Path.Combine(imagesLocation, SharedDocsDirectoryName);
}
else
VirtualFolderPath = FallbackDirectoryName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<EmbeddedResource Include="Docs\syntaxHighlight.html" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoApplications/StartupUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin

var versions = new[]
{
new Version(230,0,0),
new Version(229,0,0),
new Version(228,5,0),
};

var preloader = new Preloader(rootFolder, versions);
Expand Down
Loading

0 comments on commit 128d133

Please sign in to comment.