Feature/net6

.github/workflows/codeql.yml

@@ -0,0 +1,34 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '40 14 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/dotnet.yml

@@ -3,6 +3,7 @@ name: .NET
 on:
   push:
     branches: [ develop ]
+
   pull_request:
     branches: [ develop ]
 
@@ -12,14 +13,40 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
+
     - name: Restore dependencies
       run: dotnet restore
+
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore -p:Configuration=Release
+
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --no-restore --no-build --verbosity normal
+
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Pack
+      run: dotnet pack -p:Configuration=Release NGC.LibOpenMetaverse
+
+    - name: Publish Package
+      run: dotnet nuget push build/Release/*.nupkg --source https://nuget.pkg.github.com/OpenSim-NGC/index.json
+
+    - name: Create Release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.bump_version.outputs.new_tag }}
+        release_name: Release ${{ github.ref }}
+        body: ${{ steps.tag_version.outputs.changelog }}
+

CSJ2K/CSJ2K.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyTitle>CSJ2K</AssemblyTitle>
     <Product>CSJ2K</Product>
     <Description>JPEG2000 decoding library</Description>

Directory.Build.props

@@ -1,21 +1,31 @@
 <Project>
+
   <PropertyGroup>
-    <Version>0.10.0.0</Version>
     <Product>OpenMetaverse</Product>
     <Authors>Utopa Skye LLC, OpenMetaverse Developers</Authors>
     <Company>Utopia Skye LLC</Company>
-  </PropertyGroup>
+    <PackageVersion>1.3.1</PackageVersion>
+    <AssemblyVersion>1.3.1</AssemblyVersion>
+    <FileVersion>1.3.1</FileVersion>
+    <Version>1.3.1</Version>
+ </PropertyGroup>
+
   <PropertyGroup>
-    <PackageVersion>1.1.8</PackageVersion>
-    <AssemblyVersion>1.1.7</AssemblyVersion>
-    <FileVersion>1.1.7</FileVersion>
-    <Version>1.1.7</Version>
+    <PackageDescription>LibOpenMetaverse is an OpenSim Core compatible Open Metaverse support library</PackageDescription>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/OpenSim-NGC/libopenmetaverse</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D SecondLife</PackageTags>
     <RepositoryUrl>https://github.com/OpenSim-NGC/libopenmetaverse.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryBranch>master</RepositoryBranch>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <MSBuildProjectExtensionsPath>$(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\</MSBuildProjectExtensionsPath>
+    <IntermediateOutputPath>$(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
+    <OutputPath>$(SolutionDir)\build\$(Configuration)\$(AssemblyName)\</OutputPath>
+    <OutDir>$(OutputPath)</OutDir>
   </PropertyGroup>
 </Project>

LICENSE.txt

@@ -1,4 +1,7 @@
 
+  Copyright (c) Opensimulator, http://opensimulator.org/ 
+  All rights reserved.
+
   Copyright (c) 2006-2016, openmetaverse.co
   All rights reserved.
 

OpenMetaverse.GUI/AvatarList.cs

@@ -97,10 +97,10 @@ public AvatarList()
             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;
@@ -360,7 +360,7 @@ private void UpdateCoarseInfo(Simulator sim, List<UUID> newEntries, List<UUID> r
 
         private void defaultMenuItem_Click(object sender, EventArgs e)
         {
-            MenuItem menuItem = (MenuItem)sender;
+            ToolStripItem menuItem = (ToolStripItem)sender;
 
             switch (menuItem.Text)
             {

OpenMetaverse.GUI/InventoryTree.cs

@@ -38,13 +38,13 @@ namespace OpenMetaverse.GUI
     public class InventoryTree : TreeView
     {
         private GridClient _Client;
-        private ContextMenu _ContextMenu;
+        private ContextMenuStrip _ContextMenu;
         private UUID _SelectedItemID;
 
         /// <summary>
         /// Gets or sets the context menu associated with this control
         /// </summary>
-        public ContextMenu Menu
+        public ContextMenuStrip Menu
         {
             get { return _ContextMenu; }
             set { _ContextMenu = value; }
@@ -65,9 +65,9 @@ public GridClient Client
         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 +172,7 @@ private void InitializeClient(GridClient client)
 
         private void defaultMenuItem_Click(object sender, EventArgs e)
         {
-            MenuItem menuItem = (MenuItem)sender;
+            ToolStripItem menuItem = (ToolStripItem)sender;
 
             InventoryItem item = (InventoryItem)Client.Inventory.Store[_SelectedItemID];
 

OpenMetaverse.GUI/OpenMetaverse.GUI.csproj

@@ -1,18 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <TargetFrameworks>net48</TargetFrameworks>
+	<TargetFramework>net6.0-windows</TargetFramework>
+	<UseWindowsForms>true</UseWindowsForms>
     <NoWarn>1591,1574,0419,0618</NoWarn>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms">
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenMetaverse.Types\OpenMetaverse.Types.csproj" />
     <ProjectReference Include="..\OpenMetaverse\OpenMetaverse.csproj" />

OpenMetaverse.PrimMesher/OpenMetaverse.PrimMesher.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Authors>Dhalia Trimble, OpenSim Contributors, Cinder Roxley</Authors>
     <Product>OpenMetaverse.PrimMesher</Product>
     <PackageId>OpenMetaverse.PrimMesher</PackageId>
@@ -15,6 +15,6 @@
     <DefineConstants>TRACE;VERTEX_INDEXER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+	  <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 </Project>

OpenMetaverse.Rendering.Meshmerizer/OpenMetaverse.Rendering.Meshmerizer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>1591,1574,0419,0618</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

OpenMetaverse.Rendering.Simple/OpenMetaverse.Rendering.Simple.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>1591,1574,0419,0618</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

OpenMetaverse.StructuredData/JSON/OSDJson.cs

@@ -6,8 +6,6 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
-using LitJson;
-using OpenMetaverse;
 
 namespace OpenMetaverse.StructuredData
 {

OpenMetaverse.StructuredData/LLSD/NotationLLSD.cs

@@ -232,7 +232,7 @@ private static OSD DeserializeLLSDNotationElement(TextReader reader)
                     if (reader.Read(uuidBuf, 0, 36) < 36)
                         throw new OSDException("Notation LLSD parsing: Unexpected end of stream in UUID.");
                     UUID lluuid;
-                    if (!UUID.TryParse(new String(uuidBuf), out lluuid))
+                    if (!UUID.TryParse(new String(uuidBuf).AsSpan(), out lluuid))
                         throw new OSDException("Notation LLSD parsing: Invalid UUID discovered.");
                     osd = OSD.FromUUID(lluuid);
                     break;

OpenMetaverse.StructuredData/LLSD/XmlLLSD.cs

@@ -265,7 +265,7 @@ public static void EscapeToXML(string s, StringBuilder sb)
                     case '"':
                         sb.Append(""");
                         break;
-                    case '\\':
+                    case '\'':
                         sb.Append("'");
                         break;
                     default:
@@ -295,7 +295,7 @@ public static void EscapeASCIIToXML(osUTF8 ms, string s)
                     case '"':
                         ms.Append(osUTF8Const.XMLamp_quot);
                         break;
-                    case '\\':
+                    case '\'':
                         ms.Append(osUTF8Const.XMLamp_apos);
                         break;
                     default:
@@ -325,7 +325,7 @@ public static void EscapeToXML(osUTF8 ms, string s)
                     case '"':
                         ms.Append(osUTF8Const.XMLamp_quot);
                         break;
-                    case '\\':
+                    case '\'':
                         ms.Append(osUTF8Const.XMLamp_apos);
                         break;
                     default:
@@ -355,7 +355,7 @@ public static void EscapeToXML(osUTF8 ms, osUTF8 s)
                     case (byte)'"':
                         ms.Append(osUTF8Const.XMLamp_quot);
                         break;
-                    case (byte)'\\':
+                    case (byte)'\'':
                         ms.Append(osUTF8Const.XMLamp_apos);
                         break;
                     default:
@@ -636,8 +636,7 @@ private static OSD ParseLLSDXmlElement(XmlTextReader reader)
 
                     if (reader.Read())
                     {
-                        int value = 0;
-                        Int32.TryParse(reader.ReadString().Trim(), out value);
+                        Int32.TryParse(reader.ReadString().Trim(), out int value);
                         ret = OSD.FromInteger(value);
                         break;
                     }
@@ -653,7 +652,7 @@ private static OSD ParseLLSDXmlElement(XmlTextReader reader)
 
                     if (reader.Read())
                     {
-                        double value = 0d;
+                        double value;
                         string str = reader.ReadString().Trim().ToLower();
 
                         if (str == "nan")
@@ -676,8 +675,7 @@ private static OSD ParseLLSDXmlElement(XmlTextReader reader)
 
                     if (reader.Read())
                     {
-                        UUID value = UUID.Zero;
-                        UUID.TryParse(reader.ReadString().Trim(), out value);
+                        UUID.TryParse(reader.ReadString().AsSpan(), out UUID value);
                         ret = OSD.FromUUID(value);
                         break;
                     }
@@ -693,12 +691,12 @@ private static OSD ParseLLSDXmlElement(XmlTextReader reader)
 
                     if (reader.Read())
                     {
-                        DateTime value = Utils.Epoch;
-                        DateTime.TryParse(reader.ReadString().Trim(), out value);
-                        ret = OSD.FromDate(value);
+                        if(DateTime.TryParse(reader.ReadString().Trim(), out DateTime value))
+                            ret = OSD.FromDate(value);
+                        else
+                            ret = OSD.FromDate(Utils.Epoch);
                         break;
                     }
-
                     ret = OSD.FromDate(Utils.Epoch);
                     break;
                 case "string":

OpenMetaverse.StructuredData/OpenMetaverse.StructuredData.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <NoWarn>1591,1574,0419,0618</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -12,4 +12,4 @@
   <ItemGroup>
     <ProjectReference Include="..\OpenMetaverse.Types\OpenMetaverse.Types.csproj" />
   </ItemGroup>
-</Project>
+</Project>