From ee8c2679d5af15e77659400ae62985bc7a74ebc1 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Tue, 2 Jun 2020 12:32:56 +0100 Subject: [PATCH] updated to .net framework 4.7.2 and nugets --- .../Properties/Resources.Designer.cs | 2 +- SpeckleDynamo/Properties/Settings.Designer.cs | 2 +- SpeckleDynamo/SpeckleDynamo.csproj | 107 +++++++++--------- SpeckleDynamo/app.config | 2 +- SpeckleDynamo/packages.config | 11 +- .../SpeckleDynamoExtension.csproj | 17 ++- SpeckleDynamoExtension/app.config | 8 +- SpeckleDynamoExtension/packages.config | 3 +- .../SpeckleDynamoFunctions.csproj | 85 +++++++++++--- SpeckleDynamoFunctions/app.config | 11 ++ SpeckleDynamoFunctions/packages.config | 17 ++- 11 files changed, 174 insertions(+), 91 deletions(-) create mode 100644 SpeckleDynamoFunctions/app.config diff --git a/SpeckleDynamo/Properties/Resources.Designer.cs b/SpeckleDynamo/Properties/Resources.Designer.cs index ea5675d..2e5ade1 100644 --- a/SpeckleDynamo/Properties/Resources.Designer.cs +++ b/SpeckleDynamo/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SpeckleDynamo.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/SpeckleDynamo/Properties/Settings.Designer.cs b/SpeckleDynamo/Properties/Settings.Designer.cs index 0ad66b4..a9c0ef3 100644 --- a/SpeckleDynamo/Properties/Settings.Designer.cs +++ b/SpeckleDynamo/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SpeckleDynamo.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SpeckleDynamo/SpeckleDynamo.csproj b/SpeckleDynamo/SpeckleDynamo.csproj index a0d6bd9..51fc404 100644 --- a/SpeckleDynamo/SpeckleDynamo.csproj +++ b/SpeckleDynamo/SpeckleDynamo.csproj @@ -11,7 +11,7 @@ SpeckleDynamo SpeckleDynamo Speckle for Dynamo - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -20,8 +20,9 @@ true + - + AnyCPU true @@ -32,10 +33,10 @@ prompt 4 Program - C:\Program Files\Dynamo\Dynamo Core\2\DynamoSandbox.exe - 2.0 + C:\Program Files\Dynamo\Dynamo Core\2.6\DynamoSandbox.exe + 2.6 - + AnyCPU true @@ -46,8 +47,8 @@ prompt 4 Program - C:\Program Files\Autodesk\Revit 2019\Revit.exe - 2.0 + C:\Program Files\Autodesk\Revit 2021\Revit.exe + 2.5 AnyCPU @@ -57,20 +58,18 @@ TRACE prompt 4 - 2.0 + 2.5 - - ..\packages\DynamoVisualProgramming.WpfUILibrary.2.0.2.6986\lib\net45\CoreNodeModels.dll - False + + ..\packages\DynamoVisualProgramming.WpfUILibrary.2.6.0.8481\lib\net47\CoreNodeModels.dll - - ..\packages\DynamoVisualProgramming.WpfUILibrary.2.0.2.6986\lib\net45\CoreNodeModelsWpf.dll - False + + ..\packages\DynamoVisualProgramming.WpfUILibrary.2.6.0.8481\lib\net47\CoreNodeModelsWpf.dll ..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll @@ -78,48 +77,38 @@ ..\packages\Countly.19.8.0\lib\net40-client\Countly.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DesignScriptBuiltin.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DesignScriptBuiltin.dll ..\packages\DeviceId.4.3.0\lib\net40\DeviceId.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DSIronPython.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DSIronPython.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoApplications.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DynamoApplications.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoCore.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DynamoCore.dll - - ..\packages\DynamoVisualProgramming.WpfUILibrary.2.0.2.6986\lib\net45\DynamoCoreWpf.dll - False + + ..\packages\DynamoVisualProgramming.WpfUILibrary.2.6.0.8481\lib\net47\DynamoCoreWpf.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoInstallDetective.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DynamoInstallDetective.dll - - ..\packages\DynamoVisualProgramming.DynamoServices.2.0.2.6986\lib\net45\DynamoServices.dll - False + + ..\packages\DynamoVisualProgramming.DynamoServices.2.6.0.8481\lib\net47\DynamoServices.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoShapeManager.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DynamoShapeManager.dll - - ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.2.6986\lib\net45\DynamoUnits.dll - False + + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.6.0.8481\lib\net47\DynamoUnits.dll - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoUtilities.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\DynamoUtilities.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll @@ -164,16 +153,14 @@ ..\packages\NUnit.2.6.3\lib\nunit.framework.dll False - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\ProtoCore.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\ProtoCore.dll - - ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.2.6986\lib\net45\ProtoGeometry.dll - False + + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.6.0.8481\lib\net47\ProtoGeometry.dll - - ..\packages\SpeckleCore.1.6.17-wip\lib\net45\SpeckleCore.dll + + ..\packages\SpeckleCore.1.8.0.430\lib\net45\SpeckleCore.dll ..\packages\SpecklePopup.1.6.13\lib\net45\SpecklePopup.dll @@ -198,6 +185,16 @@ + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll + True + True + + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll + True + True + ..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll False @@ -207,13 +204,11 @@ - 4.0 - - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\VMDataBridge.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.6.0.8481\lib\net47\VMDataBridge.dll ..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll diff --git a/SpeckleDynamo/app.config b/SpeckleDynamo/app.config index be68f72..b831bb0 100644 --- a/SpeckleDynamo/app.config +++ b/SpeckleDynamo/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/SpeckleDynamo/packages.config b/SpeckleDynamo/packages.config index bfd6f72..54f2b8b 100644 --- a/SpeckleDynamo/packages.config +++ b/SpeckleDynamo/packages.config @@ -4,10 +4,10 @@ - - - - + + + + @@ -17,7 +17,7 @@ - + @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/SpeckleDynamoExtension/SpeckleDynamoExtension.csproj b/SpeckleDynamoExtension/SpeckleDynamoExtension.csproj index e4c1b14..b569c59 100644 --- a/SpeckleDynamoExtension/SpeckleDynamoExtension.csproj +++ b/SpeckleDynamoExtension/SpeckleDynamoExtension.csproj @@ -11,7 +11,7 @@ Properties SpeckleDynamoExtension SpeckleDynamoExtension - v4.5 + v4.7.2 512 @@ -169,8 +169,8 @@ ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.2.6986\lib\net45\ProtoGeometry.dll False - - ..\packages\SpeckleCore.1.6.9\lib\net45\SpeckleCore.dll + + ..\packages\SpeckleCore.1.8.0.430\lib\net45\SpeckleCore.dll ..\packages\SpecklePopup.1.6.13\lib\net45\SpecklePopup.dll @@ -198,6 +198,16 @@ + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll + True + True + + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll + True + True + ..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll False @@ -207,7 +217,6 @@ - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\VMDataBridge.dll diff --git a/SpeckleDynamoExtension/app.config b/SpeckleDynamoExtension/app.config index e936cc1..3b11353 100644 --- a/SpeckleDynamoExtension/app.config +++ b/SpeckleDynamoExtension/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/SpeckleDynamoExtension/packages.config b/SpeckleDynamoExtension/packages.config index 79bec4b..3371375 100755 --- a/SpeckleDynamoExtension/packages.config +++ b/SpeckleDynamoExtension/packages.config @@ -15,7 +15,7 @@ - + @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/SpeckleDynamoFunctions/SpeckleDynamoFunctions.csproj b/SpeckleDynamoFunctions/SpeckleDynamoFunctions.csproj index 1c9b284..9eb4dca 100644 --- a/SpeckleDynamoFunctions/SpeckleDynamoFunctions.csproj +++ b/SpeckleDynamoFunctions/SpeckleDynamoFunctions.csproj @@ -9,9 +9,12 @@ Properties SpeckleDynamoFunctions SpeckleDynamoFunctions - v4.5 + v4.7.2 512 true + + + true @@ -31,41 +34,38 @@ 4 + + ..\packages\Countly.19.8.0\lib\net40-client\Countly.dll + ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DesignScriptBuiltin.dll - False + + + ..\packages\DeviceId.4.3.0\lib\net40\DeviceId.dll ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DSIronPython.dll - False ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoApplications.dll - False ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoCore.dll - False ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoInstallDetective.dll - False ..\packages\DynamoVisualProgramming.DynamoServices.2.0.2.6986\lib\net45\DynamoServices.dll - False ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoShapeManager.dll - False ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.2.6986\lib\net45\DynamoUnits.dll - False ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\DynamoUtilities.dll - False ..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Expression.Interactions.dll @@ -83,9 +83,17 @@ ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll False - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - False + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NUnit.2.6.3\lib\nunit.framework.dll @@ -93,14 +101,42 @@ ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\ProtoCore.dll - False ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.2.6986\lib\net45\ProtoGeometry.dll - False + + + ..\packages\SpeckleCore.1.8.0.430\lib\net45\SpeckleCore.dll + + + ..\packages\sqlite-net-pcl.1.5.231\lib\netstandard1.1\SQLite-net.dll + + + ..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\net45\SQLitePCLRaw.batteries_green.dll + + + ..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\net45\SQLitePCLRaw.batteries_v2.dll + + + ..\packages\SQLitePCLRaw.core.1.1.11\lib\net45\SQLitePCLRaw.core.dll + + + ..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.11\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll + + + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll + True + True + + + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll + True + True + ..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll False @@ -109,11 +145,12 @@ - ..\packages\DynamoVisualProgramming.Core.2.0.2.6986\lib\net45\VMDataBridge.dll - False + + + ..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll @@ -123,6 +160,7 @@ + @@ -151,4 +189,17 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + \ No newline at end of file diff --git a/SpeckleDynamoFunctions/app.config b/SpeckleDynamoFunctions/app.config new file mode 100644 index 0000000..3b11353 --- /dev/null +++ b/SpeckleDynamoFunctions/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/SpeckleDynamoFunctions/packages.config b/SpeckleDynamoFunctions/packages.config index 9a8248c..bd32e6c 100644 --- a/SpeckleDynamoFunctions/packages.config +++ b/SpeckleDynamoFunctions/packages.config @@ -1,10 +1,25 @@  + + - + + + + + + + + + + + + + + \ No newline at end of file