From d7e796efcbb12bed5b6509dee0fba94097ce0d19 Mon Sep 17 00:00:00 2001 From: Cinder Date: Fri, 18 Jun 2021 17:39:18 -0500 Subject: [PATCH] Add Net 5.0 target, remove deprecated WinForms widget classes --- LibreMetaverse.GUI/AvatarList.cs | 12 ++++++------ LibreMetaverse.GUI/InventoryTree.cs | 13 +++++++------ LibreMetaverse.GUI/LibreMetaverse.GUI.csproj | 5 +++-- .../LibreMetaverse.Rendering.Meshmerizer.csproj | 2 +- .../LibreMetaverse.Rendering.Simple.csproj | 2 +- .../LibreMetaverse.StructuredData.csproj | 2 +- LibreMetaverse.Tests/LibreMetaverse.Tests.csproj | 4 ++-- .../LibreMetaverse.Utilities.csproj | 2 +- LibreMetaverse/LibreMetaverse.csproj | 2 +- LibreMetaverseTypes/LibreMetaverse.Types.csproj | 2 +- PrimMesher/LibreMetaverse.PrimMesher.csproj | 2 +- Programs/Baker/Baker.cs | 1 - Programs/Baker/Baker.csproj | 5 +++-- Programs/GridProxy/GridProxy.csproj | 4 ++-- Programs/VoiceTest/VoiceTest.csproj | 4 ++-- Programs/examples/IRCGateway/IRCGateway.csproj | 4 ++-- Programs/examples/TestClient/TestClient.csproj | 4 ++-- Programs/mapgenerator/mapgenerator.csproj | 4 ++-- 18 files changed, 38 insertions(+), 36 deletions(-) diff --git a/LibreMetaverse.GUI/AvatarList.cs b/LibreMetaverse.GUI/AvatarList.cs index e7e65e67..b2edbc7e 100644 --- a/LibreMetaverse.GUI/AvatarList.cs +++ b/LibreMetaverse.GUI/AvatarList.cs @@ -1,5 +1,6 @@ /* * Copyright (c) 2006-2016, openmetaverse.co + * Copyright (c) 2019-2021, Sjofn LLC * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -26,7 +27,6 @@ using OpenMetaverse; using System; -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; @@ -99,10 +99,10 @@ namespace OpenMetaverse.GUI this.ListViewItemSorter = _ColumnSorter; EventHandler clickHandler = new EventHandler(defaultMenuItem_Click); - this.ContextMenu = new ContextMenu(); - this.ContextMenu.MenuItems.Add("Offer Teleport", clickHandler); - this.ContextMenu.MenuItems.Add("Teleport To", clickHandler); - this.ContextMenu.MenuItems.Add("Walk To", clickHandler); + this.ContextMenuStrip = new ContextMenuStrip(); + this.ContextMenuStrip.Items.Add("Offer Teleport", null, clickHandler); + this.ContextMenuStrip.Items.Add("Teleport To", null, clickHandler); + this.ContextMenuStrip.Items.Add("Walk To", null, clickHandler); this.DoubleBuffered = true; this.ListViewItemSorter = _ColumnSorter; @@ -362,7 +362,7 @@ namespace OpenMetaverse.GUI private void defaultMenuItem_Click(object sender, EventArgs e) { - MenuItem menuItem = (MenuItem)sender; + ToolStripMenuItem menuItem = (ToolStripMenuItem)sender; switch (menuItem.Text) { diff --git a/LibreMetaverse.GUI/InventoryTree.cs b/LibreMetaverse.GUI/InventoryTree.cs index b4fd414f..2a1dddde 100644 --- a/LibreMetaverse.GUI/InventoryTree.cs +++ b/LibreMetaverse.GUI/InventoryTree.cs @@ -1,5 +1,6 @@ /* * Copyright (c) 2006-2016, openmetaverse.co + * Copyright (c) 2019-2021, Sjofn LLC * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -38,13 +39,13 @@ namespace OpenMetaverse.GUI public class InventoryTree : TreeView { private GridClient _Client; - private ContextMenu _ContextMenu; + private ContextMenuStrip _ContextMenu; private UUID _SelectedItemID; /// /// Gets or sets the context menu associated with this control /// - public ContextMenu Menu + public ContextMenuStrip Menu { get { return _ContextMenu; } set { _ContextMenu = value; } @@ -65,9 +66,9 @@ namespace OpenMetaverse.GUI public InventoryTree() { EventHandler clickHandler = new EventHandler(defaultMenuItem_Click); - _ContextMenu = new ContextMenu(); - _ContextMenu.MenuItems.Add("Wear", clickHandler); - _ContextMenu.MenuItems.Add("Detach", clickHandler); + _ContextMenu = new ContextMenuStrip(); + _ContextMenu.Items.Add("Wear", null, clickHandler); + _ContextMenu.Items.Add("Detach", null, clickHandler); this.NodeMouseClick += new TreeNodeMouseClickEventHandler(InventoryTree_NodeMouseClick); this.BeforeExpand += new TreeViewCancelEventHandler(InventoryTree_BeforeExpand); @@ -172,7 +173,7 @@ namespace OpenMetaverse.GUI private void defaultMenuItem_Click(object sender, EventArgs e) { - MenuItem menuItem = (MenuItem)sender; + ToolStripMenuItem menuItem = (ToolStripMenuItem)sender; InventoryItem item = (InventoryItem)Client.Inventory.Store[_SelectedItemID]; diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj index 86ed45b2..0a34d0d3 100644 --- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj +++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj @@ -10,7 +10,8 @@ Grid IE50 false - net471;net48 + net471;net48;net50-windows + true Library LibreMetaverse.GUI true @@ -91,7 +92,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse.GUI - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj index a8d6f25d..e2449a96 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj +++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj @@ -76,7 +76,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse.Rendering.Meshmerizer - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj index 124b2f94..3a537735 100644 --- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj +++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj @@ -73,7 +73,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj index 29b7060d..8442863e 100644 --- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj +++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj @@ -72,7 +72,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse.StructuredData - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj index 28768cad..0f532b19 100644 --- a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj +++ b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj @@ -10,7 +10,7 @@ Grid IE50 false - netcoreapp3.1 + netcoreapp3.1;net50 Library LibreMetaverse.Tests true @@ -86,7 +86,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj index 63323ba3..50a39267 100644 --- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj +++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj @@ -76,7 +76,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj index 767241a9..f95f12bd 100644 --- a/LibreMetaverse/LibreMetaverse.csproj +++ b/LibreMetaverse/LibreMetaverse.csproj @@ -79,7 +79,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/LibreMetaverseTypes/LibreMetaverse.Types.csproj b/LibreMetaverseTypes/LibreMetaverse.Types.csproj index 575c9d8c..529950b5 100644 --- a/LibreMetaverseTypes/LibreMetaverse.Types.csproj +++ b/LibreMetaverseTypes/LibreMetaverse.Types.csproj @@ -66,7 +66,7 @@ 1.2.0 Sjofn LLC, Openmetaverse Developers - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/PrimMesher/LibreMetaverse.PrimMesher.csproj b/PrimMesher/LibreMetaverse.PrimMesher.csproj index e3292555..3fe00fcf 100644 --- a/PrimMesher/LibreMetaverse.PrimMesher.csproj +++ b/PrimMesher/LibreMetaverse.PrimMesher.csproj @@ -14,7 +14,7 @@ 1.2.0 LibreMetaverse.PrimMesher LibreMetaverse.PrimMesher - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/Programs/Baker/Baker.cs b/Programs/Baker/Baker.cs index 2d438c0f..4add86e9 100644 --- a/Programs/Baker/Baker.cs +++ b/Programs/Baker/Baker.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Windows.Forms; namespace Baker diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj index 7fca48c6..1d16c99b 100644 --- a/Programs/Baker/Baker.csproj +++ b/Programs/Baker/Baker.csproj @@ -6,7 +6,8 @@ JScript Grid IE50 - net471;net48 + net471;net48;net50-windows + true WinExe true @@ -28,7 +29,7 @@ Sjofn LLC, OpenMetaverse Developers 1.2.0 - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LibreMetaverse LICENSE.txt https://github.com/cinderblocks/libremetaverse diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj index 285a902d..7ea00e54 100644 --- a/Programs/GridProxy/GridProxy.csproj +++ b/Programs/GridProxy/GridProxy.csproj @@ -13,7 +13,7 @@ Library GridProxy true - netcoreapp3.1 + netcoreapp3.1;net5 True @@ -70,7 +70,7 @@ 1.2.0 - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LibreMetaverse Sjofn LLC, OpenMetaverse Developers Sjofn LLC diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VoiceTest/VoiceTest.csproj index 090efaa6..1ed2fb74 100644 --- a/Programs/VoiceTest/VoiceTest.csproj +++ b/Programs/VoiceTest/VoiceTest.csproj @@ -24,14 +24,14 @@ - netcoreapp3.1 + netcoreapp3.1;net50 1.2.0 Sjofn LLC, OpenMetaverse Developers - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. LibreMetaverse diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj index 56903a1c..1ef8ddaa 100644 --- a/Programs/examples/IRCGateway/IRCGateway.csproj +++ b/Programs/examples/IRCGateway/IRCGateway.csproj @@ -24,7 +24,7 @@ - netcoreapp3.1 + netcoreapp3.1;net5 @@ -32,7 +32,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. https://github.com/cinderblocks/libremetaverse LICENSE.txt diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj index 606cefc0..c4e276aa 100644 --- a/Programs/examples/TestClient/TestClient.csproj +++ b/Programs/examples/TestClient/TestClient.csproj @@ -23,7 +23,7 @@ false - netcoreapp3.1 + netcoreapp3.1;net50 @@ -31,7 +31,7 @@ 1.2.0 Sjofn LLC, OpenMetaverse Developers LibreMetaverse - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved. + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved. diff --git a/Programs/mapgenerator/mapgenerator.csproj b/Programs/mapgenerator/mapgenerator.csproj index 32bf6365..39880496 100644 --- a/Programs/mapgenerator/mapgenerator.csproj +++ b/Programs/mapgenerator/mapgenerator.csproj @@ -8,7 +8,7 @@ JScript Grid IE50 - netcoreapp3.1 + netcoreapp3.1;net50 Exe @@ -31,7 +31,7 @@ Sjofn LLC, Openmetaverse Developers - Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2019. All rights reserved + Copyright © OpenMetaverse Developers 2008, 2017. Copyright © Sjofn LLC 2018-2021. All rights reserved LICENSE.txt https://github.com/cinderblocks/libremetaverse 1.2.0