From 398ef081905eb9dcd861bce7ebdd1c12f14acedf Mon Sep 17 00:00:00 2001 From: Andre Minelli Date: Mon, 5 Jul 2021 11:45:38 -0300 Subject: [PATCH 1/2] Upgrade TestConsole to .Net 5 (by Upgrade Assistant) --- .../Lime.Client.TestConsole.csproj | 280 ++---------------- src/Lime.Client.TestConsole/packages.config | 18 -- src/Lime.Client.sln | 9 +- 3 files changed, 32 insertions(+), 275 deletions(-) delete mode 100644 src/Lime.Client.TestConsole/packages.config diff --git a/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj b/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj index 9e9866c1..8406cd68 100644 --- a/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj +++ b/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj @@ -1,23 +1,10 @@ - - - + - Debug - AnyCPU - {9E13148D-726D-4E42-B924-4A1AF4F0DC3E} + net5.0-windows WinExe - Properties - Lime.Client.TestConsole - Lime.Client.TestConsole - v4.6.1 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true ..\ true false - \\smc2.takenet.com.br\Departamentos\Tecnologia\Binarios\Plataformas\Iris\Lime.Client.TestConsole\ true Unc @@ -40,25 +27,9 @@ false true true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + true + true E9FC58BA8181DBF8AC4AD49E163A78C7C051BF92 @@ -76,218 +47,12 @@ lime.ico - - ..\packages\MvvmLightLibs.4.4.32.7\lib\net45\GalaSoft.MvvmLight.dll - True - - - ..\packages\MvvmLightLibs.4.4.32.7\lib\net45\GalaSoft.MvvmLight.Extras.dll - True - - - ..\packages\Lime.Messaging.0.8.70-beta\lib\net461\Lime.Messaging.dll - - - ..\packages\Lime.Protocol.0.8.70-beta\lib\net461\Lime.Protocol.dll - - - ..\packages\Lime.Transport.Tcp.0.8.70-beta\lib\net461\Lime.Transport.Tcp.dll - - - ..\packages\Lime.Transport.WebSocket.0.8.70-beta\lib\net461\Lime.Transport.WebSocket.dll - - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\ReflectionMagic.3.1.0\lib\net45\ReflectionMagic.dll - - - ..\packages\SslCertBinding.Net.1.0.2\lib\net20\SslCertBinding.Net.dll - True - - - ..\packages\StackExchange.Redis.1.1.608\lib\net46\StackExchange.Redis.dll - True - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - - - - - ..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll - - - - ..\packages\MvvmLightLibs.4.4.32.7\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - - 4.0 - - - - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.DataGrid.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.2.0\lib\net40\Xceed.Wpf.Toolkit.dll - True - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EnvelopeView.xaml - - - SessionView.xaml - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - False @@ -314,19 +79,26 @@ - + + + + + + + + + + + + + + + + + + - - - This project references NuGet package(s) that are missing on this computer. Enable 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/src/Lime.Client.TestConsole/packages.config b/src/Lime.Client.TestConsole/packages.config deleted file mode 100644 index 3451fb4b..00000000 --- a/src/Lime.Client.TestConsole/packages.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Lime.Client.sln b/src/Lime.Client.sln index d942a7fb..04d66a22 100644 --- a/src/Lime.Client.sln +++ b/src/Lime.Client.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.14 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lime.Client.TestConsole", "Lime.Client.TestConsole\Lime.Client.TestConsole.csproj", "{9E13148D-726D-4E42-B924-4A1AF4F0DC3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lime.Client.TestConsole", "Lime.Client.TestConsole\Lime.Client.TestConsole.csproj", "{9E13148D-726D-4E42-B924-4A1AF4F0DC3E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lime.Client.Windows", "Lime.Client.Windows\Lime.Client.Windows.csproj", "{1847098B-FE9E-4E40-AA69-9E70FAF5D06E}" EndProject @@ -29,4 +29,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E1DF7082-9FDC-4078-8AC1-CF19406760F3} + EndGlobalSection EndGlobal From bb25a0d01468f09d575a5323d112a156c20efb07 Mon Sep 17 00:00:00 2001 From: Andre Minelli Date: Mon, 5 Jul 2021 11:56:00 -0300 Subject: [PATCH 2/2] Update Lime and WPF packages to latest versions --- .../Lime.Client.TestConsole.csproj | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj b/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj index 8406cd68..3730efc2 100644 --- a/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj +++ b/src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj @@ -80,16 +80,12 @@ - - - - - - - - + + + + - +