Skip to content

Commit

Permalink
DYN-5993: Migrate WorkspaceDependencyViewExtension, and other project…
Browse files Browse the repository at this point in the history
…s to .NET 6 (#14140)

* add mimemapping dep to workspacedep extension for net6

* migrate DynamoWPFCLI

* migrate DynamoPackagesWPF

* migrate notifications extension

* migrate DynamoManipulation

* migrate systemtestservices

* update sln

* review comments

* migrate integrationtests
  • Loading branch information
aparajit-pratap authored Jul 7, 2023
1 parent bbca487 commit 0206613
Show file tree
Hide file tree
Showing 14 changed files with 442 additions and 291 deletions.
10 changes: 10 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -627,3 +627,13 @@ Apache 2.0
https://github.com/JoshClose/CsvHelper/blob/master/LICENSE.txt

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

MimeMapping v2.0.0
MIT License
https://licenses.nuget.org/MIT
Copyright (c) <year> <copyright holders>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
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.
459 changes: 251 additions & 208 deletions doc/distrib/License.rtf

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions src/Dynamo.All.Net6.sln
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,24 @@ 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}") = "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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoPackagesWPF", "DynamoPackagesWPF\DynamoPackagesWPF.csproj", "{47D2166C-5261-4093-9660-E72B7035E666}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notifications", "Notifications\Notifications.csproj", "{09F48994-BB2F-4A26-8CCD-469FE3F7F904}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoManipulation", "DynamoManipulation\DynamoManipulation.csproj", "{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemTestServices", "..\test\Libraries\SystemTestServices\SystemTestServices.csproj", "{89563CD0-509B-40A5-8728-9D3EC6FE8410}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Watch3DNodeModelsWpf", "Libraries\Watch3DNodeModelsWpf\Watch3DNodeModelsWpf.csproj", "{B9E338CA-6677-4772-B01D-1FCEABCDAAAB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{F0BFEE09-CE03-42F6-9DF1-DED4D86C2A73}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "..\test\System\IntegrationTests\IntegrationTests.csproj", "{1254D922-643B-4F0B-82BD-E9E02399B040}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|NET60_Windows = Debug|NET60_Windows
Expand Down Expand Up @@ -332,10 +348,38 @@ 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
{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
{5E76AAB3-6302-473E-9655-081B53FB1419}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{F7FD9395-35D5-474D-8AD1-9904817E70D3}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{F7FD9395-35D5-474D-8AD1-9904817E70D3}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{F7FD9395-35D5-474D-8AD1-9904817E70D3}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{F7FD9395-35D5-474D-8AD1-9904817E70D3}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{47D2166C-5261-4093-9660-E72B7035E666}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{47D2166C-5261-4093-9660-E72B7035E666}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{47D2166C-5261-4093-9660-E72B7035E666}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{47D2166C-5261-4093-9660-E72B7035E666}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{09F48994-BB2F-4A26-8CCD-469FE3F7F904}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{09F48994-BB2F-4A26-8CCD-469FE3F7F904}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{09F48994-BB2F-4A26-8CCD-469FE3F7F904}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{09F48994-BB2F-4A26-8CCD-469FE3F7F904}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{89563CD0-509B-40A5-8728-9D3EC6FE8410}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{89563CD0-509B-40A5-8728-9D3EC6FE8410}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{89563CD0-509B-40A5-8728-9D3EC6FE8410}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{89563CD0-509B-40A5-8728-9D3EC6FE8410}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -382,7 +426,14 @@ 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}
{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}
{33F88E8C-CC3C-4237-8AA9-CC891EFCABFA} = {88D45B00-E564-41DB-B57C-9509646CAA49}
{89563CD0-509B-40A5-8728-9D3EC6FE8410} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
{F0BFEE09-CE03-42F6-9DF1-DED4D86C2A73} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
{1254D922-643B-4F0B-82BD-E9E02399B040} = {F0BFEE09-CE03-42F6-9DF1-DED4D86C2A73}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D}
Expand Down
44 changes: 23 additions & 21 deletions src/DynamoCore/DynamoCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,26 @@
<PropertyGroup>
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
</PropertyGroup>
<ItemGroup>
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibG228Deps Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
<LibG228 Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_228_0_0\*" />
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
<ExternSimplexNoise Include="$(SolutionDir)..\extern\SimplexNoise\*" />
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
<NodeHelpFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.*" />
<OpenSourceLicenses Include="$(SolutionDir)..\doc\distrib\Open Source Licenses\**\*.*" />
<LocalizedResources Include="$(SolutionDir)..\extern\Localized\**\*.*" />
<LegacyBinariesToBinFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\*" />
<LegacyBinariesToNodesFolder Include="$(SolutionDir)..\extern\legacy_remove_me\nodes\*" />
<LegacyBinariesToBinResourcesFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\en-US\*" />
</ItemGroup>
<ItemGroup>
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibG228Deps Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
<LibG228 Include="$(PkgDynamoVisualProgramming_LibG_228_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_228_0_0\*" />
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
<ExternSimplexNoise Include="$(SolutionDir)..\extern\SimplexNoise\*" />
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
<NodeHelpFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.*" />
<OpenSourceLicenses Include="$(SolutionDir)..\doc\distrib\Open Source Licenses\**\*.*" />
<LocalizedResources Include="$(SolutionDir)..\extern\Localized\**\*.*" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<LegacyBinariesToBinFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\*" />
<LegacyBinariesToNodesFolder Include="$(SolutionDir)..\extern\legacy_remove_me\nodes\*" />
<LegacyBinariesToBinResourcesFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\en-US\*" />
</ItemGroup>
<Copy SourceFiles="$(SolutionDir)..\README.md" DestinationFiles="$(OutputPath)README.txt" />
<Copy SourceFiles="$(SolutionDir)..\doc\distrib\License.rtf" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="$(SolutionDir)..\doc\distrib\TermsOfUse.rtf" DestinationFolder="$(OutputPath)" />
Expand All @@ -172,9 +174,9 @@
<Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\BuiltIn.xml" DestinationFolder="$(OutputPath)\$(UICulture)" />
<Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\BuiltIn.Migrations.xml" DestinationFolder="$(OutputPath)" />
<!--Enable these if/when we need to keep old binaries for patch installer compatability-->
<Copy SourceFiles="@(LegacyBinariesToBinFolder)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(LegacyBinariesToNodesFolder)" DestinationFolder="$(OutputPath)\nodes\" />
<Copy SourceFiles="@(LegacyBinariesToBinResourcesFolder)" DestinationFolder="$(OutputPath)\en-US\" />
<Copy SourceFiles="@(LegacyBinariesToBinFolder)" DestinationFolder="$(OutputPath)" Condition=" '$(TargetFramework)' == 'net48' "/>
<Copy SourceFiles="@(LegacyBinariesToNodesFolder)" DestinationFolder="$(OutputPath)\nodes\" Condition=" '$(TargetFramework)' == 'net48' "/>
<Copy SourceFiles="@(LegacyBinariesToBinResourcesFolder)" DestinationFolder="$(OutputPath)\en-US\" Condition=" '$(TargetFramework)' == 'net48' "/>
<Copy SourceFiles="$(SolutionDir)Config\upiconfig.xml" DestinationFolder="$(OutputPath)" />
</Target>
<Target Name="AfterBuildOps" AfterTargets="ResolveSateliteResDeps">
Expand Down
7 changes: 5 additions & 2 deletions src/DynamoManipulation/DynamoManipulation.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand All @@ -9,7 +12,7 @@
<RootNamespace>Dynamo.Manipulation</RootNamespace>
<AssemblyName>DynamoManipulation</AssemblyName>
</PropertyGroup>
<ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down
5 changes: 4 additions & 1 deletion src/DynamoPackagesWPF/DynamoPackagesWPF.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand Down
5 changes: 4 additions & 1 deletion src/DynamoWPFCLI/DynamoWPFCLI.csproj
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 @@ -13,7 +16,7 @@
<Reference Include="Microsoft.Practices.Prism">
<HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="WindowsBase" Condition=" '$(TargetFramework)' == 'net48' "/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
30 changes: 18 additions & 12 deletions src/Notifications/Notifications.csproj
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 @@ -8,6 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dynamo.Notifications</RootNamespace>
<AssemblyName>Notifications</AssemblyName>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>

<Target Name="NpmRunBuild" BeforeTargets="BeforeBuild">
Expand Down Expand Up @@ -51,18 +55,20 @@
<EmbeddedResource Include="Packages\NotificationCenter\build\index.bundle.js" />
<EmbeddedResource Include="Packages\NotificationCenter\build\index.html" />
</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>
<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 Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DynamoCoreWpf\DynamoCoreWpf.csproj">
<Project>{51bb6014-43f7-4f31-b8d3-e3c37ebedaf4}</Project>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Web;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using Dynamo.Core;
using Dynamo.Graph.Workspaces;
using Dynamo.Logging;
using Dynamo.PackageManager;
using Dynamo.Utilities;
using Dynamo.ViewModels;
using Dynamo.Wpf.Extensions;
using Dynamo.Wpf.Utilities;
using DynamoUtilities;
using MimeMapping;


namespace Dynamo.WorkspaceDependency
{
Expand Down Expand Up @@ -419,27 +417,27 @@ public ImageSource Icon
bitmap = Properties.Resources.ZeroTouchNodeReferenceIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("image"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("image"):
bitmap = Properties.Resources.ImageIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("excel") || MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("spreadsheet"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("excel") || MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("spreadsheet"):
bitmap = Properties.Resources.ExcelIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("json"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("json"):
bitmap = Properties.Resources.JsonIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("pdf"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("pdf"):
bitmap = Properties.Resources.PDFIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("csv"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("csv"):
bitmap = Properties.Resources.CSVIcon;
break;

case ReferenceType.External when MimeMapping.GetMimeMapping(DependencyInfo.Name).Contains("dwg"):
case ReferenceType.External when MimeUtility.GetMimeMapping(DependencyInfo.Name).Contains("dwg"):
bitmap = Properties.Resources.DWGIcon;
break;

Expand Down
Loading

0 comments on commit 0206613

Please sign in to comment.