From bc7516016fa3af225fbe07054c2e938a6c462648 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 12 Oct 2019 13:04:38 -0700 Subject: [PATCH 1/2] Work on enabling nullable references --- .../FRC.NetworkTables.Core.Web.csproj | 2 +- .../FRC.NetworkTables.Core.csproj | 15 ++++++++++++--- src/FRC.NetworkTables.Core/ManagedValue.cs | 2 +- src/FRC.NetworkTables.Core/NetworkTableEntry.cs | 2 +- .../NetworkTableInstance.cs | 6 +++--- .../NetworkTableInstancePollers.cs | 8 ++++---- src/FRC.NetworkTables.Core/RefManagedValue.cs | 2 +- .../FRC.NetworkTables.Dev.csproj | 2 +- src/NetworkTablesAPI/NetworkTablesAPI.csproj | 2 +- .../FRC.NetworkTables.Core.Test.csproj | 2 +- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj b/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj index b707545..62f0286 100644 --- a/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj +++ b/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj @@ -5,7 +5,7 @@ - 7.3 + 8.0 diff --git a/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj b/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj index 0ff899d..01b05dc 100644 --- a/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj +++ b/src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj @@ -1,4 +1,4 @@ - + Library @@ -27,12 +27,21 @@ true - 7.3 + 8.0 FRC.NetworkTables + enable + + + + 1591 - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/FRC.NetworkTables.Core/ManagedValue.cs b/src/FRC.NetworkTables.Core/ManagedValue.cs index a8d55d6..6023456 100644 --- a/src/FRC.NetworkTables.Core/ManagedValue.cs +++ b/src/FRC.NetworkTables.Core/ManagedValue.cs @@ -81,7 +81,7 @@ public bool Equals(ManagedValue other) } } - public object GetValue() + public object? GetValue() { switch (Type) { diff --git a/src/FRC.NetworkTables.Core/NetworkTableEntry.cs b/src/FRC.NetworkTables.Core/NetworkTableEntry.cs index 025bf36..d6c0985 100644 --- a/src/FRC.NetworkTables.Core/NetworkTableEntry.cs +++ b/src/FRC.NetworkTables.Core/NetworkTableEntry.cs @@ -41,7 +41,7 @@ public NetworkTableValue GetValue() return new NetworkTableValue(NtCore.GetEntryValue(Handle)); } - public object GetObjectValue() + public object? GetObjectValue() { var v = NtCore.GetEntryValue(Handle); return v.GetValue(); diff --git a/src/FRC.NetworkTables.Core/NetworkTableInstance.cs b/src/FRC.NetworkTables.Core/NetworkTableInstance.cs index c02f55f..e0f8e78 100644 --- a/src/FRC.NetworkTables.Core/NetworkTableInstance.cs +++ b/src/FRC.NetworkTables.Core/NetworkTableInstance.cs @@ -13,13 +13,13 @@ public partial class NetworkTableInstance : IDisposable, IEquatable(CreateEntryListenerThread); m_connectionListenerToken = new Lazy(CreateConnectionListenerThread); m_rpcListenerToken = new Lazy(CreateRpcListenerThread); m_loggerListenerToken = new Lazy(CreateLoggerThread); + + m_owned = false; + Handle = handle; } public void Dispose() diff --git a/src/FRC.NetworkTables.Core/NetworkTableInstancePollers.cs b/src/FRC.NetworkTables.Core/NetworkTableInstancePollers.cs index f58d0c8..9ee6342 100644 --- a/src/FRC.NetworkTables.Core/NetworkTableInstancePollers.cs +++ b/src/FRC.NetworkTables.Core/NetworkTableInstancePollers.cs @@ -9,7 +9,7 @@ public unsafe partial class NetworkTableInstance { private readonly ConcurrentDictionary m_entryListeners = new ConcurrentDictionary(); private readonly Lazy m_entryListenerToken; - private Thread m_entryListenerThread; + private Thread? m_entryListenerThread; private NtEntryListenerPoller m_entryListenerPoller; private readonly object m_entryListenerWaitQueueLock = new object(); private bool m_entryListenerWaitQueue = false; @@ -133,7 +133,7 @@ public bool WaitForEntryListenerQueue(double timeout) private readonly ConcurrentDictionary m_connectionListeners = new ConcurrentDictionary(); private readonly Lazy m_connectionListenerToken; - private Thread m_connectionListenerThread; + private Thread? m_connectionListenerThread; private NtConnectionListenerPoller m_connectionListenerPoller; private readonly object m_connectionListenerWaitQueueLock = new object(); private bool m_connectionListenerWaitQueue = false; @@ -246,7 +246,7 @@ public bool WaitForConnectionListenerQueue(double timeout) private readonly ConcurrentDictionary m_rpcCalls = new ConcurrentDictionary(); private readonly Lazy m_rpcListenerToken; - private Thread m_rpcListenerThread; + private Thread? m_rpcListenerThread; private NtRpcCallPoller m_rpcListenerPoller; private readonly object m_rpcListenerWaitQueueLock = new object(); private bool m_rpcListenerWaitQueue = false; @@ -367,7 +367,7 @@ public bool WaitForRpcCallQueue(double timeout) private readonly ConcurrentDictionary m_loggerListeners = new ConcurrentDictionary(); private readonly Lazy m_loggerListenerToken; - private Thread m_loggerListenerThread; + private Thread? m_loggerListenerThread; private NtLoggerPoller m_loggerListenerPoller; private readonly object m_loggerListenerWaitQueueLock = new object(); private bool m_loggerListenerWaitQueue = false; diff --git a/src/FRC.NetworkTables.Core/RefManagedValue.cs b/src/FRC.NetworkTables.Core/RefManagedValue.cs index df61a7f..5fee30b 100644 --- a/src/FRC.NetworkTables.Core/RefManagedValue.cs +++ b/src/FRC.NetworkTables.Core/RefManagedValue.cs @@ -77,7 +77,7 @@ public bool Equals(RefManagedValue other) } } - public object GetValue() + public object? GetValue() { switch (Type) { diff --git a/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj b/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj index 0a59632..2024575 100644 --- a/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj +++ b/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj @@ -6,7 +6,7 @@ - 7.3 + 8.0 x64 true true diff --git a/src/NetworkTablesAPI/NetworkTablesAPI.csproj b/src/NetworkTablesAPI/NetworkTablesAPI.csproj index 7f87ff5..1733e9f 100644 --- a/src/NetworkTablesAPI/NetworkTablesAPI.csproj +++ b/src/NetworkTablesAPI/NetworkTablesAPI.csproj @@ -5,7 +5,7 @@ - 7.3 + 8.0 diff --git a/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj b/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj index 7104c54..d7e2fa0 100644 --- a/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj +++ b/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj @@ -8,7 +8,7 @@ true - 7.3 + 8.0 From ea74d42d7016b7a781007dc5c402929e64e379cf Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 12 Oct 2019 13:29:45 -0700 Subject: [PATCH 2/2] Make everything nullable --- .../FRC.NetworkTables.Core.Web.csproj | 5 +++-- src/FRC.NetworkTables.Core.Web/NTHub.cs | 2 +- src/FRC.NetworkTables.Core.Web/NtResponse.cs | 2 +- src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj | 3 ++- src/NetworkTablesAPI/NetworkTablesAPI.csproj | 7 ++----- src/NetworkTablesAPI/Startup.cs | 2 +- .../FRC.NetworkTables.Core.Test.csproj | 9 ++++++--- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj b/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj index 62f0286..79ada8c 100644 --- a/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj +++ b/src/FRC.NetworkTables.Core.Web/FRC.NetworkTables.Core.Web.csproj @@ -1,15 +1,16 @@ - netstandard2.0 + netstandard2.1 + enable 8.0 - + diff --git a/src/FRC.NetworkTables.Core.Web/NTHub.cs b/src/FRC.NetworkTables.Core.Web/NTHub.cs index 7136a40..c86041d 100644 --- a/src/FRC.NetworkTables.Core.Web/NTHub.cs +++ b/src/FRC.NetworkTables.Core.Web/NTHub.cs @@ -26,7 +26,7 @@ public void SetFlags(string key, EntryFlags flags) m_instance.GetEntry(key).SetFlags(flags); } - public object GetValue(string key) + public object? GetValue(string key) { return m_instance.GetEntry(key).GetObjectValue(); } diff --git a/src/FRC.NetworkTables.Core.Web/NtResponse.cs b/src/FRC.NetworkTables.Core.Web/NtResponse.cs index 3f4125a..1d5aaa3 100644 --- a/src/FRC.NetworkTables.Core.Web/NtResponse.cs +++ b/src/FRC.NetworkTables.Core.Web/NtResponse.cs @@ -5,7 +5,7 @@ namespace FRC.NetworkTables.Core.Web public struct NtResponse { public string Key; - public object Value; + public object? Value; public EntryFlags Flags; public ulong LastChange; } diff --git a/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj b/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj index 2024575..b9e5ae0 100644 --- a/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj +++ b/src/FRC.NetworkTables.Dev/FRC.NetworkTables.Dev.csproj @@ -2,12 +2,13 @@ Exe - netcoreapp2.1 + netcoreapp3.0 8.0 x64 + enable true true diff --git a/src/NetworkTablesAPI/NetworkTablesAPI.csproj b/src/NetworkTablesAPI/NetworkTablesAPI.csproj index 1733e9f..58189f7 100644 --- a/src/NetworkTablesAPI/NetworkTablesAPI.csproj +++ b/src/NetworkTablesAPI/NetworkTablesAPI.csproj @@ -1,21 +1,18 @@ - netcoreapp2.1 + netcoreapp3.0 8.0 + enable - - - - diff --git a/src/NetworkTablesAPI/Startup.cs b/src/NetworkTablesAPI/Startup.cs index dd62f2a..b3fe90e 100644 --- a/src/NetworkTablesAPI/Startup.cs +++ b/src/NetworkTablesAPI/Startup.cs @@ -30,7 +30,7 @@ public Startup(IConfiguration configuration) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); + services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); var instance = NetworkTableInstance.Default; instance.StartServer(); services.AddNetworkTables(instance); diff --git a/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj b/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj index d7e2fa0..9fd4603 100644 --- a/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj +++ b/test/FRC.NetworkTables.Core.Test/FRC.NetworkTables.Core.Test.csproj @@ -12,9 +12,12 @@ - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +