Nuget changes (DynamoDS#14250)

* Revert "Nuget changes for internal published Nugets (DynamoDS#14204)" This reverts commit 4b5be5f. * Revert "Update (DynamoDS#14205)" This reverts commit 43fe6a7. * Revert "Nuget changes for NET60 public nugets (DynamoDS#14200)" This reverts commit 6794757. * clean up
reddyashish · Aug 10, 2023 · 33cc2bd · 33cc2bd
1 parent c0fa585
commit 33cc2bd
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 55 deletions.
diff --git a/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntimeNET60.nuspec b/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreRuntimeNET60.nuspec
diff --git a/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreSymbols.nuspec b/tools/NuGet/template-artifactory/DynamoVisualProgramming.DynamoCoreSymbols.nuspec
@@ -19,8 +19,6 @@
     <files>
         <file src="*.pdb" target="lib\net48" exclude="CefSharp*.pdb;Helix*.pdb;MIConvexHull.NET Standard.pdb;*Test*.pdb;"/>
         <file src="nodes\*.pdb" target="lib\net48\nodes" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\*.pdb" target="lib\net6.0\nodes" />
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-artifactory/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-artifactory/DynamoVisualProgramming.Tests.nuspec
@@ -29,10 +29,11 @@
         <file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\net48" />
         <file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\net48" />
         <file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
+<!--
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoCoreTests.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\SystemTestServices.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\TestServices.dll" target="lib\net6.0" />
+-->
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Core.nuspec
@@ -63,7 +63,7 @@
         <!--TODO - arguable if DynamoPackages should be in this package-->
         <file src="DynamoPackages.dll" target="lib\net48" />
         <file src="DynamoPackages.xml" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
+        <!--
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoApplications.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoApplications.xml" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoCore.dll" target="lib\net6.0" />
@@ -82,7 +82,7 @@
         <file src="..\..\..\bin\NET60_Windows\Release\DSCPython.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoPackages.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoPackages.xml" target="lib\net6.0" />
-
+-->
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.DynamoCoreNodes.nuspec
@@ -44,19 +44,20 @@
         <file src="nodes\Watch3DNodeModels.xml" target="lib\net48" />
         <file src="nodes\UnitsNodeModels.dll" target="lib\net48" />
         <file src="nodes\UnitsNodeModels.xml" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
-        <file src="..\..\..\bin\NET60_Windows\Release\Analysis.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\Analysis.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\GeometryColor.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\GeometryColor.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\DSCoreNodes.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\DSCoreNodes.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\CoreNodeModels.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\CoreNodeModels.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\Watch3DNodeModels.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\Watch3DNodeModels.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\UnitsNodeModels.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\UnitsNodeModels.xml" target="lib\net6.0" />
+        <!--
+        <file src="..\..\NET60_Windows\Release\Analysis.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\Analysis.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\GeometryColor.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\GeometryColor.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\DSCoreNodes.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\DSCoreNodes.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\CoreNodeModels.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\CoreNodeModels.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\Watch3DNodeModels.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\Watch3DNodeModels.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\UnitsNodeModels.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\UnitsNodeModels.xml" target="lib\net6.0" /> -->
+
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.Tests.nuspec
@@ -26,13 +26,16 @@
     </metadata>
     <files>
         <!--These assemblies are referenced from the bin directory since they are not harvested for the installer-->
+
         <file src="..\..\..\bin\AnyCPU\Release\DynamoCoreTests.dll" target="lib\net48" />
         <file src="..\..\..\bin\AnyCPU\Release\SystemTestServices.dll" target="lib\net48" />
         <file src="..\..\..\bin\AnyCPU\Release\TestServices.dll" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
+        <!--
         <file src="..\..\..\bin\NET60_Windows\Release\DynamoCoreTests.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\SystemTestServices.dll" target="lib\net6.0" />
         <file src="..\..\..\bin\NET60_Windows\Release\TestServices.dll" target="lib\net6.0" />
+        -->
+
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.WpfUILibrary.nuspec
@@ -38,10 +38,11 @@
         <file src="DynamoCoreWpf.dll" target="lib\net48" />
         <file src="nodes\CoreNodeModelsWpf.dll" target="lib\net48" />
         <file src="nodes\CoreNodeModelsWpf.xml" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
-        <file src="..\..\..\bin\NET60_Windows\Release\DynamoCoreWpf.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\CoreNodeModelsWpf.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\nodes\CoreNodeModelsWpf.xml" target="lib\net6.0" />
+        <!--
+        <file src="..\..\NET60_Windows\Release\DynamoCoreWpf.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\CoreNodeModelsWpf.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\nodes\CoreNodeModelsWpf.xml" target="lib\net6.0" />
+        -->
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>
diff --git a/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec b/tools/NuGet/template-nuget/DynamoVisualProgramming.ZeroTouchLibrary.nuspec
@@ -29,12 +29,12 @@
         <file src="DynamoUnits.xml" target="lib\net48" />
         <file src="ProtoGeometry.dll" target="lib\net48" />
         <file src="ProtoGeometry.xml" target="lib\net48" />
-        <!--NET60 binaries, the path may change after we stop building NET48 solution-->
-        <file src="..\..\..\bin\NET60_Windows\Release\DynamoUnits.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\DynamoUnits.xml" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\ProtoGeometry.dll" target="lib\net6.0" />
-        <file src="..\..\..\bin\NET60_Windows\Release\ProtoGeometry.xml" target="lib\net6.0" />
-
+        <!--
+        <file src="..\..\NET60_Windows\Release\DynamoUnits.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\DynamoUnits.xml" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\ProtoGeometry.dll" target="lib\net6.0" />
+        <file src="..\..\NET60_Windows\Release\ProtoGeometry.xml" target="lib\net6.0" />
+        -->
         <file src="..\..\..\doc\distrib\Images\logo_square_32x32.png" target="content\images\logo.png" />
     </files>
 </package>