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.

Sign up for GitHub

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

Dyn-6139 - Align pipelines #14261

Merged
merged 24 commits into from
Aug 17, 2023
Merged

Dyn-6139 - Align pipelines #14261

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a5f9af3
First pass NET60_Windows -> Any CPU
sm6srw Aug 10, 2023
88174da
More Fixes
sm6srw Aug 10, 2023
dd05d29
More tweaks
sm6srw Aug 10, 2023
38dd92b
More tweaks
sm6srw Aug 10, 2023
cf1cb8d
Another one
sm6srw Aug 10, 2023
4e451f4
Test
sm6srw Aug 10, 2023
f8940cd
More testing
sm6srw Aug 10, 2023
4ebd3ea
One more test
sm6srw Aug 10, 2023
c88d810
More tweaks
sm6srw Aug 10, 2023
626dfe2
Revert back
sm6srw Aug 11, 2023
0a607d3
More fixes
sm6srw Aug 11, 2023
d3d338d
Try with single quotes
sm6srw Aug 11, 2023
a6a14f3
Add escape
sm6srw Aug 11, 2023
1e6340f
Use default platform
sm6srw Aug 11, 2023
103b701
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Aug 15, 2023
c7080ed
Revert
sm6srw Aug 15, 2023
f90e860
More fixes
sm6srw Aug 15, 2023
036c68a
One more fix.
sm6srw Aug 15, 2023
26b2bd5
More spec file tweaks
sm6srw Aug 15, 2023
6fec5d1
Add ViewExtensionLibraryTests to solution.
sm6srw Aug 15, 2023
bfa92b9
Clean up props file
sm6srw Aug 15, 2023
4d247b4
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Aug 15, 2023
fb14968
Update sln.
sm6srw Aug 15, 2023
c905182
More tweaks
sm6srw Aug 16, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ 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 -p:Platform=NET60_Windows --runtime=win10-x64
run: dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln --runtime=win10-x64
- 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:Platform=NET60_Windows
.\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release
- name: Navigate back to Dynamo directory
run: |
cd $Env:GITHUB_WORKSPACE\Dynamo
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/dynamoAllNet6.0_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ jobs:
run: echo "::remove-matcher owner=csc::"

- name: Install dependencies for windows runtime
run: dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln -p:Platform=NET60_Windows --runtime=win10-x64
run: |
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
- 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:Platform=NET60_Windows
.\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /p:Configuration=Release
# look for Dynamo
- name: Navigate to Dynamo Windows Folder
run: |
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\NET60_Windows\Release"
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
24 changes: 13 additions & 11 deletions .github/workflows/dynamoBinDiff.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@ jobs:
- name: Disable problem matcher
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:Platform=NET60_Windows --runtime=win10-x64
run: |
dotnet restore $Env:GITHUB_WORKSPACE\net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
- name: Build Dynamo current branch with MSBuild for NET60-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\net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release /p:Platform=NET60_Windows
.\MSBuild.exe $Env:GITHUB_WORKSPACE\net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release
- name: Navigate to Dynamo DotNet6 Windows Folder
run: |
cd "$Env:GITHUB_WORKSPACE\net60_Win_Dynamo\bin\NET60_Windows\Release"
cd "$Env:GITHUB_WORKSPACE\net60_Win_Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoSandbox.exe" && echo "DynamoSandbox exists!"
- name: Cache Current NET6 Windows Build
uses: actions/cache/save@v3
with:
path: |
${{ github.workspace }}\net60_Win_Dynamo\bin\NET60_Windows\Release
${{ github.workspace }}\net60_Win_Dynamo\bin\AnyCPU\Release
${{ github.workspace }}\net60_Win_Dynamo\.github\scripts
key: ${{ github.run_id }}-${{ github.run_attempt }}-cache-net60Win-current
build-dotnet-windows-master:
Expand All @@ -51,21 +52,22 @@ jobs:
- name: Disable problem matcher
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:Platform=NET60_Windows --runtime=win10-x64
run: |
dotnet restore $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win10-x64
- name: Build Dynamo master branch with MSBuild for NET60-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\master_net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release /p:Platform=NET60_Windows
.\MSBuild.exe $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\src\Dynamo.All.sln /p:Configuration=Release
- name: Navigate to Dynamo DotNet6 Windows Folder
run: |
cd "$Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\bin\NET60_Windows\Release"
cd "$Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
- name: Cache Current NET6 Windows Build
uses: actions/cache/save@v3
with:
path: ${{ github.workspace }}\master_net60_Win_Dynamo\bin\NET60_Windows\Release
path: ${{ github.workspace }}\master_net60_Win_Dynamo\bin\AnyCPU\Release
key: ${{ github.run_id }}-${{ github.run_attempt }}-cache-net60Win-master
run-bin-diff-net60-windows:
needs: [build-dotnet-windows-current, build-dotnet-windows-master]
Expand All @@ -76,21 +78,21 @@ jobs:
with:
fail-on-cache-miss: true
path: |
${{ github.workspace }}\net60_Win_Dynamo\bin\NET60_Windows\Release
${{ github.workspace }}\net60_Win_Dynamo\bin\AnyCPU\Release
${{ github.workspace }}\net60_Win_Dynamo\.github\scripts
key: ${{ github.run_id }}-${{ github.run_attempt }}-cache-net60Win-current
- name: Restore Master Net60 Windows Build
uses: actions/cache/restore@v3
with:
fail-on-cache-miss: true
path: ${{ github.workspace }}\master_net60_Win_Dynamo\bin\NET60_Windows\Release
path: ${{ github.workspace }}\master_net60_Win_Dynamo\bin\AnyCPU\Release
key: ${{ github.run_id }}-${{ github.run_attempt }}-cache-net60Win-master
- name: Run Binary Diff Job
id: Diff2
run: |
echo "***Running the binary diff job between the current branch and the master branch of NET60-Windows Config!***"
cd "$Env:GITHUB_WORKSPACE\net60_Win_Dynamo\.github\scripts"
.\bin_diff.ps1 $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\bin\NET60_Windows\Release,$Env:GITHUB_WORKSPACE\net60_Win_Dynamo\bin\NET60_Windows\Release -src ${{ github.job }}
.\bin_diff.ps1 $Env:GITHUB_WORKSPACE\master_net60_Win_Dynamo\bin\AnyCPU\Release,$Env:GITHUB_WORKSPACE\net60_Win_Dynamo\bin\AnyCPU\Release -src ${{ github.job }}
echo "Diff2=$(cat ./result.txt)" >> $Env:GITHUB_OUTPUT
outputs:
Diff2: ${{ steps.Diff2.outputs.Diff2 }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/dynamoNet6.0_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ jobs:
run: echo "::remove-matcher owner=csc::"

- name: Install dependencies for windows runtime
run: dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\DynamoCore.sln -p:Platform=NET60_Windows --runtime=win10-x64
run: |
dotnet restore $Env:GITHUB_WORKSPACE\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win10-x64
- 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\DynamoCore.sln /p:Configuration=Release /p:Platform=NET60_Windows
.\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\DynamoCore.sln /p:Configuration=Release
# look for Dynamo
- name: Navigate to Dynamo Windows Folder
run: |
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\NET60_Windows\Release"
cd "$Env:GITHUB_WORKSPACE\Dynamo\bin\AnyCPU\Release"
echo "***Locating DynamoCLI for Windows!***"
test ".\DynamoCLI.exe" && echo "DynamoCLI exists!"
- name: Install dependencies for linux runtime
Expand Down
15 changes: 7 additions & 8 deletions src/Config/CS_SDK.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<Platforms>NET60_Windows;NET60_Linux;</Platforms>
<Platforms>AnyCPU;NET60_Linux;</Platforms>
aparajit-pratap marked this conversation as resolved.
Show resolved Hide resolved
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">NET60_Windows</Platform>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Copy link
Member

Choose a reason for hiding this comment

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

hmm, so what is the point of these conditions now? Just to avoid linux? Can we remove most of these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, let me clean up that file.

<PlatformTarget >x64</PlatformTarget>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
<TargetFramework>net6.0</TargetFramework>
Expand Down Expand Up @@ -33,8 +33,7 @@
<SelfContained>false</SelfContained>
</PropertyGroup>
<PropertyGroup>
<DebugType Condition="$(Platform.Contains('NET60')) ">portable</DebugType>
<DebugType Condition="!$(Platform.Contains('NET60')) ">full</DebugType>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug' ">
<Optimize>false</Optimize>
Expand All @@ -44,27 +43,27 @@
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('NET60'))" >
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<!--Needed to copy nuget package assemblies to output folder. Anet6 issue-->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<GenerateDependencyFile>false</GenerateDependencyFile>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('Windows'))" >
<PropertyGroup Condition="$(Platform.Contains('AnyCPU'))" >
Copy link
Member

Choose a reason for hiding this comment

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

so we'll only use AnyCPU for windows? Seems a bit confusing to me 😉

Copy link
Contributor Author

@sm6srw sm6srw Aug 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, and Yes, it is.

<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<DefineConstants>$(DefineConstants);_WINDOWS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('Linux'))" >
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<DefineConstants>$(DefineConstants);_LINUX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(UILib)' == 'true' AND $(Platform.Contains('NET60'))">
<PropertyGroup Condition="'$(UILib)' == 'true' AND $(Platform.Contains('AnyCPU'))">
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<!--Temporary configuration to make core test projects load UI packages successfully -->
<PropertyGroup Condition=" '$(TestProjectDefaults)' == 'true' AND $(Platform.Contains('Windows')) ">
<PropertyGroup Condition=" '$(TestProjectDefaults)' == 'true' AND $(Platform.Contains('AnyCPU')) ">
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Loading