Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into definedata-hierarchy
Browse files Browse the repository at this point in the history
  • Loading branch information
dnenov committed Apr 17, 2024
2 parents 61fd8fc + 732ea62 commit e47fec3
Show file tree
Hide file tree
Showing 148 changed files with 104,273 additions and 108,781 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_dynamo_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dynamo_core_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win-x64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dynamo_api_break.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
dotnet-version: '8.0.x'

- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2

- name: Install dependencies for windows runtime
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dynamo_bin_diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64 -p:DotNet=net8.0
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.3
uses: microsoft/setup-msbuild@v2
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\master\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64 -p:DotNet=net8.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui_smoke_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Publish Test Report
id: test_report
if: always()
uses: dorny/test-reporter@v1.8.0
uses: dorny/test-reporter@v1.9.0
with:
name: ${{ env.CHECK_NAME }}
path: reports/report.xml
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@DYNAMO v.3.1.0 © 2024 Autodesk, Inc. All rights reserved.
@DYNAMO v.3.2.0 © 2024 Autodesk, Inc. All rights reserved.
Dynamo License

Those portions created by Ian are provided with the following copyright:
Expand Down
462 changes: 227 additions & 235 deletions doc/distrib/License.rtf

Large diffs are not rendered by default.

Loading

0 comments on commit e47fec3

Please sign in to comment.