Dyn-6139 - Align pipelines (#14261)

* First pass NET60_Windows -> Any CPU * More Fixes * More tweaks * More tweaks * Another one * Test * More testing * One more test * More tweaks * Revert back * More fixes * Try with single quotes * Add escape * Use default platform * Revert * More fixes * One more fix. * More spec file tweaks * Add ViewExtensionLibraryTests to solution. * Clean up props file * Update sln. * More tweaks
DynamoDS · Aug 17, 2023 · c3bbdf0 · c3bbdf0
1 parent 3045444
commit c3bbdf0
Show file tree

Hide file tree

Showing 26 changed files with 591 additions and 1,071 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -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

diff --git a/.github/workflows/dynamoAllNet6.0_build.yml b/.github/workflows/dynamoAllNet6.0_build.yml
@@ -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!"
diff --git a/.github/workflows/dynamoBinDiff.yml b/.github/workflows/dynamoBinDiff.yml
@@ -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:
@@ -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]
@@ -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 }}

diff --git a/.github/workflows/dynamoNet6.0_build.yml b/.github/workflows/dynamoNet6.0_build.yml
@@ -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

diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Platforms>NET60_Windows;NET60_Linux;</Platforms>
+    <Platforms>AnyCPU;NET60_Linux;</Platforms>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">NET60_Windows</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <PlatformTarget >x64</PlatformTarget>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
     <TargetFramework>net6.0</TargetFramework>
@@ -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>
@@ -44,27 +43,26 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-    <PropertyGroup Condition="$(Platform.Contains('NET60'))" >
-    <TargetFramework>net6.0</TargetFramework>
+    <PropertyGroup>
     <!--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'))" >
     <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 $(RuntimeIdentifier.Contains('win'))">
     <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 $(RuntimeIdentifier.Contains('win')) ">
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>