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

Jump to bottom

replace Xceed.Wpf.Toolkit with DotNetProjects.Extended.Wpf.Toolkit #14129

Merged
merged 6 commits into from
Jul 12, 2023
Merged

replace Xceed.Wpf.Toolkit with DotNetProjects.Extended.Wpf.Toolkit #14129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
315494d
update
pinzart Jul 6, 2023
a8049a2
update
pinzart Jul 7, 2023
becb5be
Merge branch 'master' into exceed_net6
pinzart Jul 10, 2023
2a93591
Update License.rtf
pinzart Jul 10, 2023
4651635
update
pinzart Jul 11, 2023
2286279
update
pinzart Jul 11, 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
18 changes: 18 additions & 0 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,3 +647,21 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

DotNetProjects.Extended.Wpf.Toolkit v5.0.103
Microsoft Public License
https://github.com/dotnetprojects/WpfExtendedToolkit/blob/Extended/LICENSE.md

This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.

1. Definitions
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. A "contribution" is the original software, or any additions or changes to the software. A "contributor" is any person that distributes its contribution under this license. "Licensed patents" are a contributor's patent claims that read directly on its contribution.
2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
3. Conditions and Limitations
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees, or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
691 changes: 360 additions & 331 deletions doc/distrib/License.rtf
View file
Open in desktop

Large diffs are not rendered by default.

Empty file added extern/legacy_remove_me/nodes/Xceed.Wpf.Toolkit.dll
View file
Open in desktop
Empty file.
6 changes: 6 additions & 0 deletions src/Dynamo.All.Net6.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoSandbox", "DynamoSand
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyRenamerCLI", "Tools\AssemblyRenamerCLI\AssemblyRenamerCLI.csproj", "{F382C3F8-C55C-4350-800A-3D13A94F8E13}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreNodeModelsWpf", "Libraries\CoreNodeModelsWpf\CoreNodeModelsWpf.csproj", "{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspaceDependencyViewExtension", "WorkspaceDependencyViewExtension\WorkspaceDependencyViewExtension.csproj", "{5E76AAB3-6302-473E-9655-081B53FB1419}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoWPFCLI", "DynamoWPFCLI\DynamoWPFCLI.csproj", "{F7FD9395-35D5-474D-8AD1-9904817E70D3}"
Expand Down Expand Up @@ -348,6 +349,10 @@ Global
{F382C3F8-C55C-4350-800A-3D13A94F8E13}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{F382C3F8-C55C-4350-800A-3D13A94F8E13}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{F382C3F8-C55C-4350-800A-3D13A94F8E13}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{5E76AAB3-6302-473E-9655-081B53FB1419}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{5E76AAB3-6302-473E-9655-081B53FB1419}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{5E76AAB3-6302-473E-9655-081B53FB1419}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
Expand Down Expand Up @@ -426,6 +431,7 @@ Global
{4C2AEACC-617D-4B90-ADCD-FE294A43A68F} = {2C6A6573-28B0-4239-BD33-6AECCD25106C}
{0DD3E4ED-66AA-47FC-9EB9-2A0E6A0EA01B} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1}
{F382C3F8-C55C-4350-800A-3D13A94F8E13} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1}
{F5932F7D-8E34-4787-80B8-E7F9D996EDFF} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
{5E76AAB3-6302-473E-9655-081B53FB1419} = {88D45B00-E564-41DB-B57C-9509646CAA49}
{47D2166C-5261-4093-9660-E72B7035E666} = {88D45B00-E564-41DB-B57C-9509646CAA49}
{09F48994-BB2F-4A26-8CCD-469FE3F7F904} = {88D45B00-E564-41DB-B57C-9509646CAA49}
Expand Down
16 changes: 6 additions & 10 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand All @@ -14,7 +14,7 @@
<DocumentationFile>$(OutputPath)\DynamoCoreWpf.XML</DocumentationFile>
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
<EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -159,11 +159,7 @@
<HintPath>..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<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">
Expand Down
1 change: 0 additions & 1 deletion src/Libraries/CoreNodeModelsWpf/Charts/Controls/PieChartControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using LiveCharts.Wpf;
using System.ComponentModel;
using System.Windows;
using System.Web.ModelBinding;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was causing an issue on dotnet6 (it is not really needed)

using System.Collections.Generic;
using System.Linq;

Expand Down
70 changes: 36 additions & 34 deletions src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand All @@ -10,6 +13,7 @@
<AssemblyName>CoreNodeModelsWpf</AssemblyName>
<OutputPath>$(OutputPath)\nodes\</OutputPath>
<DocumentationFile>$(OutputPath)\CoreNodeModelsWpf.XML</DocumentationFile>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<PropertyGroup>
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
Expand All @@ -22,6 +26,11 @@
</ItemDefinitionGroup>
<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" />
Expand All @@ -35,51 +44,47 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<PackageReference Include="LiveCharts" Version="0.9.7" />
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
<Reference Include="Xceed.Wpf.Toolkit, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>$(PkgExtended_Wpf_Toolkit)\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCoreWpf\DynamoCoreWpf.csproj">
<Project>{51bb6014-43f7-4f31-b8d3-e3c37ebedaf4}</Project>
<Name>DynamoCoreWpf</Name>
<Private>False</Private>
<Project>{51bb6014-43f7-4f31-b8d3-e3c37ebedaf4}</Project>
<Name>DynamoCoreWpf</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
<Name>DynamoCore</Name>
<Private>False</Private>
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
<Name>DynamoCore</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\DynamoUtilities\DynamoUtilities.csproj">
<Project>{b5f435cb-0d8a-40b1-a4f7-5ecb3ce792a9}</Project>
<Name>DynamoUtilities</Name>
<Private>False</Private>
<Project>{b5f435cb-0d8a-40b1-a4f7-5ecb3ce792a9}</Project>
<Name>DynamoUtilities</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Engine\ProtoCore\ProtoCore.csproj">
<Project>{7a9e0314-966f-4584-baa3-7339cbb849d1}</Project>
<Name>ProtoCore</Name>
<Private>False</Private>
<Project>{7a9e0314-966f-4584-baa3-7339cbb849d1}</Project>
<Name>ProtoCore</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\NodeServices\DynamoServices.csproj">
<Project>{ef879a10-041d-4c68-83e7-3192685f1bae}</Project>
<Name>DynamoServices</Name>
<Private>False</Private>
<Project>{ef879a10-041d-4c68-83e7-3192685f1bae}</Project>
<Name>DynamoServices</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\CoreNodeModels\CoreNodeModels.csproj">
<Project>{d8262d40-4880-41e4-91e4-af8f480c8637}</Project>
<Name>CoreNodeModels</Name>
<Private>False</Private>
<Project>{d8262d40-4880-41e4-91e4-af8f480c8637}</Project>
<Name>CoreNodeModels</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\CoreNodes\CoreNodes.csproj">
<Project>{87550b2b-6cb8-461e-8965-dfafe3aafb5c}</Project>
<Name>CoreNodes</Name>
<Private>False</Private>
<Project>{87550b2b-6cb8-461e-8965-dfafe3aafb5c}</Project>
<Name>CoreNodes</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\DynamoConversions\DynamoConversions.csproj">
<Project>{67cf6cf2-cd6a-442c-babe-864f896dd8ea}</Project>
<Name>DynamoConversions</Name>
<Private>False</Private>
<Project>{67cf6cf2-cd6a-442c-babe-864f896dd8ea}</Project>
<Name>DynamoConversions</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -144,9 +149,6 @@
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
</ItemGroup>
<Target Name="BinaryCompatibilityOps" 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">
Expand All @@ -156,4 +158,4 @@
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)CoreNodeModelsWpfImages.resx" OutputResources="$(ProjectDir)CoreNodeModelsWpfImages.resources" References="$(SystemDrawingDllPath)" />
<AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)CoreNodeModelsWpfImages.resources" OutputAssembly="$(OutDir)CoreNodeModelsWpf.customization.dll" Version="%(AssemblyInfo.Version)" />
</Target>
</Project>
</Project>
2 changes: 2 additions & 0 deletions src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
12 changes: 1 addition & 11 deletions src/Notifications/Notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
23 changes: 11 additions & 12 deletions test/Libraries/TestServices/TestServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading