From 6a3ac31ad80f4f200b3fc8dd1e8f9eee95817d6b Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Wed, 25 Mar 2020 00:14:32 -0500 Subject: [PATCH] Added conditional flags to new generated store files to allow compilation for .NET 3 --- .../Config/Stores/GeneratedStoreImpl/Deserialization.cs | 4 ++++ .../Config/Stores/GeneratedStoreImpl/IGeneratedStore.cs | 8 ++++---- .../Config/Stores/GeneratedStoreImpl/MakeCreator.cs | 4 ++++ .../Config/Stores/GeneratedStoreImpl/ObjectStructure.cs | 4 ++++ .../Config/Stores/GeneratedStoreImpl/Serialization.cs | 4 ++++ IPA.Loader/Config/Stores/GeneratedStoreImpl/Utility.cs | 4 ++++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs index 0dc3d5c5..16589487 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs @@ -9,6 +9,10 @@ using System.Reflection.Emit; using System.Text; using System.Threading.Tasks; using Boolean = IPA.Config.Data.Boolean; +#if NET3 +using Net3_Proxy; +using Array = Net3_Proxy.Array; +#endif namespace IPA.Config.Stores { diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/IGeneratedStore.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/IGeneratedStore.cs index 7137efb2..413535ba 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/IGeneratedStore.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/IGeneratedStore.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using System.Reflection; using System.Threading; using System.Runtime.CompilerServices; -using System.ComponentModel; -using IPA.Config.Data; +using System.ComponentModel; +using IPA.Config.Data; #if NET3 using Net3_Proxy; using Array = Net3_Proxy.Array; #endif - + [assembly: InternalsVisibleTo(IPA.Config.Stores.GeneratedStore.AssemblyVisibilityTarget)] namespace IPA.Config.Stores @@ -35,7 +35,7 @@ namespace IPA.Config.Stores void CopyFrom(T source, bool useLock); } internal interface IGeneratedPropertyChanged : INotifyPropertyChanged - { + { PropertyChangedEventHandler PropertyChangedEvent { get; } } diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/MakeCreator.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/MakeCreator.cs index c39fbcbc..fa1024d7 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/MakeCreator.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/MakeCreator.cs @@ -11,6 +11,10 @@ using System.Reflection.Emit; using System.Text; using System.Threading; using System.Threading.Tasks; +#if NET3 +using Net3_Proxy; +using Array = Net3_Proxy.Array; +#endif namespace IPA.Config.Stores { diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/ObjectStructure.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/ObjectStructure.cs index d8dcb42a..a09e39d4 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/ObjectStructure.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/ObjectStructure.cs @@ -7,6 +7,10 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; +#if NET3 +using Net3_Proxy; +using Array = Net3_Proxy.Array; +#endif namespace IPA.Config.Stores { diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Serialization.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Serialization.cs index 584d0656..23a5e1d8 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Serialization.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Serialization.cs @@ -8,6 +8,10 @@ using System.Reflection.Emit; using System.Text; using System.Threading.Tasks; using Boolean = IPA.Config.Data.Boolean; +#if NET3 +using Net3_Proxy; +using Array = Net3_Proxy.Array; +#endif namespace IPA.Config.Stores { diff --git a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Utility.cs b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Utility.cs index c0da244e..10abdaa7 100644 --- a/IPA.Loader/Config/Stores/GeneratedStoreImpl/Utility.cs +++ b/IPA.Loader/Config/Stores/GeneratedStoreImpl/Utility.cs @@ -6,6 +6,10 @@ using System.Reflection; using System.Reflection.Emit; using System.Text; using System.Threading.Tasks; +#if NET3 +using Net3_Proxy; +using Array = Net3_Proxy.Array; +#endif namespace IPA.Config.Stores {