From 3d660b4e63d9eceaf4c794dc078a3d8e43166e61 Mon Sep 17 00:00:00 2001 From: neuecc Date: Thu, 2 Sep 2021 17:56:44 +0900 Subject: [PATCH] nullnull --- ObservableCollections.sln | 17 +++++++++++++---- src/ObservableCollections/FreezedList.cs | 2 +- .../Internal/ResizableArray.cs | 3 ++- .../ObservableCollections.csproj | 14 ++++++++++++++ src/ObservableCollections/ObservableHashSet.cs | 4 ++-- .../Shims/CompilerServices.cs | 4 ++-- src/ObservableCollections/Shims/Nullables.cs | 4 ++-- 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/ObservableCollections.sln b/ObservableCollections.sln index c6a681f..9d8ae24 100644 --- a/ObservableCollections.sln +++ b/ObservableCollections.sln @@ -5,19 +5,23 @@ VisualStudioVersion = 17.0.31521.260 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F60DC54-F617-4841-8C79-6B0137500D1C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObservableCollections", "src\ObservableCollections\ObservableCollections.csproj", "{E11AB334-00A9-4042-848F-F81AFDD4C634}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "src\ObservableCollections\ObservableCollections.csproj", "{E11AB334-00A9-4042-848F-F81AFDD4C634}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{FD836539-75F1-4707-BCFF-751B95DAE19C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp", "sandbox\WpfApp\WpfApp.csproj", "{4D937626-2CAE-4987-BFFA-BD53597F3338}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp", "sandbox\WpfApp\WpfApp.csproj", "{4D937626-2CAE-4987-BFFA-BD53597F3338}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp", "sandbox\ConsoleApp\ConsoleApp.csproj", "{3F3A73AC-DA6E-4987-8AA9-9B1E226D3DD5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorApp", "sandbox\BlazorApp\BlazorApp.csproj", "{7E10EF01-24DC-4346-8A18-F791BB5252A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorApp", "sandbox\BlazorApp\BlazorApp.csproj", "{7E10EF01-24DC-4346-8A18-F791BB5252A7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B6D0425C-7902-4EFB-B0EA-99F164C20835}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObservableCollections.Tests", "tests\ObservableCollections.Tests\ObservableCollections.Tests.csproj", "{B84027E4-9B39-4FB6-B888-C55CE4C79152}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections.Tests", "tests\ObservableCollections.Tests\ObservableCollections.Tests.csproj", "{B84027E4-9B39-4FB6-B888-C55CE4C79152}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7133A3F7-B398-4DE0-8295-0F1ECFCC4CE4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostBuildUtility", "tools\PostBuildUtility\PostBuildUtility.csproj", "{29E3967D-89E9-494F-B1E6-9706B8F1CD57}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,6 +49,10 @@ Global {B84027E4-9B39-4FB6-B888-C55CE4C79152}.Debug|Any CPU.Build.0 = Debug|Any CPU {B84027E4-9B39-4FB6-B888-C55CE4C79152}.Release|Any CPU.ActiveCfg = Release|Any CPU {B84027E4-9B39-4FB6-B888-C55CE4C79152}.Release|Any CPU.Build.0 = Release|Any CPU + {29E3967D-89E9-494F-B1E6-9706B8F1CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29E3967D-89E9-494F-B1E6-9706B8F1CD57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29E3967D-89E9-494F-B1E6-9706B8F1CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29E3967D-89E9-494F-B1E6-9706B8F1CD57}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,6 +63,7 @@ Global {3F3A73AC-DA6E-4987-8AA9-9B1E226D3DD5} = {FD836539-75F1-4707-BCFF-751B95DAE19C} {7E10EF01-24DC-4346-8A18-F791BB5252A7} = {FD836539-75F1-4707-BCFF-751B95DAE19C} {B84027E4-9B39-4FB6-B888-C55CE4C79152} = {B6D0425C-7902-4EFB-B0EA-99F164C20835} + {29E3967D-89E9-494F-B1E6-9706B8F1CD57} = {7133A3F7-B398-4DE0-8295-0F1ECFCC4CE4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4156A725-69F4-469F-9BBB-0EE9921CA83E} diff --git a/src/ObservableCollections/FreezedList.cs b/src/ObservableCollections/FreezedList.cs index 9ec87ae..f7666e5 100644 --- a/src/ObservableCollections/FreezedList.cs +++ b/src/ObservableCollections/FreezedList.cs @@ -1,4 +1,4 @@ -using ObservableCollections.Internal; +using ObservableCollections.Internal; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/ObservableCollections/Internal/ResizableArray.cs b/src/ObservableCollections/Internal/ResizableArray.cs index a999db0..d767a88 100644 --- a/src/ObservableCollections/Internal/ResizableArray.cs +++ b/src/ObservableCollections/Internal/ResizableArray.cs @@ -5,7 +5,8 @@ using System.Runtime.CompilerServices; namespace ObservableCollections.Internal { - internal ref struct ResizableArray + // internal ref struct ResizableArray + internal struct ResizableArray : IDisposable { T[]? array; int count; diff --git a/src/ObservableCollections/ObservableCollections.csproj b/src/ObservableCollections/ObservableCollections.csproj index 496abf6..e357766 100644 --- a/src/ObservableCollections/ObservableCollections.csproj +++ b/src/ObservableCollections/ObservableCollections.csproj @@ -10,4 +10,18 @@ + + + $(MSBuildProjectDirectory)\..\ObservableCollections.Unity\Assets\Plugins\ObservableCollections\Runtime\ + + + + + + + + + + + diff --git a/src/ObservableCollections/ObservableHashSet.cs b/src/ObservableCollections/ObservableHashSet.cs index 3183f0c..5ad41c6 100644 --- a/src/ObservableCollections/ObservableHashSet.cs +++ b/src/ObservableCollections/ObservableHashSet.cs @@ -1,4 +1,4 @@ -using ObservableCollections.Internal; +using ObservableCollections.Internal; using System; using System.Collections; using System.Collections.Generic; @@ -180,7 +180,7 @@ namespace ObservableCollections } } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NET_STANDARD_2_0 && !NET_4_6 public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue) { diff --git a/src/ObservableCollections/Shims/CompilerServices.cs b/src/ObservableCollections/Shims/CompilerServices.cs index 07826dc..c4fe593 100644 --- a/src/ObservableCollections/Shims/CompilerServices.cs +++ b/src/ObservableCollections/Shims/CompilerServices.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; @@ -8,7 +8,7 @@ namespace System.Runtime.CompilerServices { internal static bool IsReferenceOrContainsReferences() { -#if NETSTANDARD2_0 +#if NETSTANDARD2_0 || NET_STANDARD_2_0 || NET_4_6 return true; #else return RuntimeHelpers.IsReferenceOrContainsReferences(); diff --git a/src/ObservableCollections/Shims/Nullables.cs b/src/ObservableCollections/Shims/Nullables.cs index 3e96443..9b745a3 100644 --- a/src/ObservableCollections/Shims/Nullables.cs +++ b/src/ObservableCollections/Shims/Nullables.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Text; -#if NETSTANDARD2_0 +#if NETSTANDARD2_0 || NET_STANDARD_2_0 || NET_4_6 namespace System.Diagnostics.CodeAnalysis {