update

DynamoDS · Jul 11, 2023 · 4651635 · 4651635
1 parent 2a93591
commit 4651635
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 56 deletions.
diff --git a/extern/legacy_remove_me/bin/Xceed.Wpf.Toolkit.dll b/extern/legacy_remove_me/bin/Xceed.Wpf.Toolkit.dll
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -113,7 +113,7 @@
     <None Remove="Views\GuidedTour\HtmlPages\Resources\ConnectTheNode.gif" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" /> 
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' "> 
     <Reference Include="System.Configuration" />
@@ -158,21 +158,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" Condition=" '$(TargetFramework)' == 'net6.0-windows' "/>
-    <PackageReference Include="Extended.Wpf.Toolkit" version="3.0.0" Condition=" '$(TargetFramework)' == 'net48' ">
-        <GeneratePathProperty>true</GeneratePathProperty>
-        <!--Exclude copying the dll because we will handle it in the BinaryCompatibilityOps target -->
-        <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
     <PackageReference Include="Prism.Core" Version="8.1.97" />
-	<PackageReference Include="Extended.Wpf.Toolkit" version="3.0.0">
-	  <GeneratePathProperty>true</GeneratePathProperty>
-    <!--Exclude copying the dll because we will handle it in the BinaryCompatibilityOps target -->
-    <ExcludeAssets>runtime</ExcludeAssets>
-	</PackageReference> 
+    <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\InstalledPackagesControl.xaml.cs">

diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
@@ -24,9 +24,13 @@
       <DestinationSubDirectory>..\</DestinationSubDirectory>
     </ReferenceCopyLocalPaths>
   </ItemDefinitionGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
   <ItemGroup>
     <PackageReference Include="Prism.Core" Version="8.1.97" />
+    <PackageReference Include="LiveCharts" Version="0.9.7" />
+    <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
+    <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -40,21 +44,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL" Condition=" '$(TargetFramework)' == 'net48' " >
-        <HintPath>$(PkgExtended_Wpf_Toolkit)\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-        <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
-      <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-        <HintPath>..\..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-        <Private>False</Private>
-    </Reference>
-    <PackageReference Include="LiveCharts" Version="0.9.7" />
-    <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
     <ProjectReference Include="..\..\DynamoCoreWpf\DynamoCoreWpf.csproj">
         <Project>{51bb6014-43f7-4f31-b8d3-e3c37ebedaf4}</Project>
         <Name>DynamoCoreWpf</Name>
@@ -158,9 +149,6 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
   </ItemGroup>
-  <Target Name="BinaryCompatibilityOps" Condition=" '$(TargetFramework)' == 'net48' " BeforeTargets="Build">
-    <Copy SourceFiles="$(PkgExtended_Wpf_Toolkit)\lib\net40\Xceed.Wpf.Toolkit.dll" DestinationFolder="$(OutputPath)" />
-  </Target>
   <Target Name="GenerateFiles" AfterTargets="ResolveSateliteResDeps" Condition=" '$(OS)' != 'Unix' ">
     <!-- Get assembly -->
     <GetAssemblyIdentity AssemblyFiles="$(OutDir)$(TargetName).dll">

diff --git a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj
@@ -33,6 +33,8 @@
 	<PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" CopyPDB="true" />
 	<PackageReference Include="SharpDX.DXGI" Version="4.2.0" CopyPDB="true" />
 	<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" CopyPDB="true" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Drawing" />

diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj
@@ -59,19 +59,9 @@
 		<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
 		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
         <PackageReference Include="Prism.Core" Version="8.1.97" />
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-		<Reference Include="System.Xaml" />
-		<Reference Include="WindowsBase" />
-	</ItemGroup>
-    <ItemGroup>
         <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
-        <Reference Include="Microsoft.Practices.Prism">
-            <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-    </ItemGroup>
+	</ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
         <Reference Include="PresentationCore" />
         <Reference Include="PresentationFramework" />

diff --git a/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj b/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj
@@ -9,18 +9,17 @@
     <RootNamespace>TestServices</RootNamespace>
     <AssemblyName>TestServices</AssemblyName>
   </PropertyGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">         
-        <PackageReference Include="NUnit" Version="2.6.3" />
-        <PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
-    </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-        <PackageReference Include="NUnit" Version="3.13.3" />
-    </ItemGroup>
-  <ItemGroup>
-      <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.1400"/>
-
-
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+  <ItemGroup>         
+    <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.1400"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+    <PackageReference Include="NUnit" Version="2.6.3" />
+    <PackageReference Include="NUnitTestAdapter" Version="2.3.0" ExcludeAssets="all" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />