From 6acbcfc21bc2fbe55e1dff000591faa17d950ee0 Mon Sep 17 00:00:00 2001 From: Marc Hernandez Date: Tue, 24 Sep 2019 22:32:32 -0700 Subject: [PATCH] Unifying library versions --- Log.cs | 4 +- Properties/AssemblyInfo.cs | 36 -------- SharpLib.csproj | 178 +++++-------------------------------- SharpLib.csproj.old | 164 ++++++++++++++++++++++++++++++++++ SharpLib.sln | 20 ----- UpgradeLog.XML | Bin 2482 -> 0 bytes UpgradeLog.htm | Bin 16270 -> 0 bytes XmlFormatter.cs | 17 ++-- XmlFormatter2.cs | 2 +- packages.config | 8 -- 10 files changed, 194 insertions(+), 235 deletions(-) delete mode 100644 Properties/AssemblyInfo.cs create mode 100644 SharpLib.csproj.old delete mode 100644 SharpLib.sln delete mode 100644 UpgradeLog.XML delete mode 100644 UpgradeLog.htm delete mode 100644 packages.config diff --git a/Log.cs b/Log.cs index 67ef964..180aa3e 100644 --- a/Log.cs +++ b/Log.cs @@ -200,7 +200,7 @@ namespace lib m_errorStream = new FileStream( filename + ".error", FileMode.Append, FileAccess.Write ); m_errorWriter = new StreamWriter( m_errorStream ); - Debug.Listeners.Add( this ); + //Debug.Listeners.Add( this ); string msg = "\n==============================================================================\nLogfile " + filename + " startup at " + DateTime.Now.ToString(); @@ -297,6 +297,7 @@ namespace lib //Console.WriteLine( finalMsg ); //Console.Out.Write( finalMsg ); + /* foreach( var l_obj in Debug.Listeners ) { var l = l_obj as TraceListener; @@ -305,6 +306,7 @@ namespace lib l.WriteLine( finalMsg ); } } + */ m_writer.WriteLine( finalMsg ); diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index 6c7d80d..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "Common" )] -[assembly: AssemblyDescription( "" )] -[assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "Allusion Studio, Inc" )] -[assembly: AssemblyProduct( "Common" )] -[assembly: AssemblyCopyright( "Copyright © Allusion Studio, Inc 2008" )] -[assembly: AssemblyTrademark( "" )] -[assembly: AssemblyCulture( "" )] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible( false )] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid( "fbc724c2-ea86-47cf-ae0b-f15e11ba6701" )] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "1.0.0.0" )] -[assembly: AssemblyFileVersion( "1.0.0.0" )] diff --git a/SharpLib.csproj b/SharpLib.csproj index 48c49cf..c281455 100644 --- a/SharpLib.csproj +++ b/SharpLib.csproj @@ -1,165 +1,29 @@ - - + + - Debug - AnyCPU - 10.0.20506 - 2.0 - {DED134FC-C282-49C9-BA02-3CE6257E91FC} - Library - Properties + + netcoreapp2.0; + net462; + netstandard2.0; + lib - SharpLib - v4.6.2 - 512 - - - - - 3.5 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU + 0.0.1.0 + 0.0.1.0 + 2019+ Marc Hernandez + A core set of libraries + AnyCPU;x64 + true true - On - false - latest - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + - - - ..\..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - ..\..\packages\System.Collections.Immutable.1.6.0-preview3.19128.7\lib\netstandard2.0\System.Collections.Immutable.dll - - - 3.5 - - - ..\..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - 3.0 - - - - 3.5 - - - 3.5 - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - \ No newline at end of file + + + diff --git a/SharpLib.csproj.old b/SharpLib.csproj.old new file mode 100644 index 0000000..fb814ae --- /dev/null +++ b/SharpLib.csproj.old @@ -0,0 +1,164 @@ + + + + Debug + AnyCPU + 10.0.20506 + 2.0 + {DED134FC-C282-49C9-BA02-3CE6257E91FC} + Library + Properties + lib + SharpLib + v4.6.2 + 512 + + + + + 3.5 + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AnyCPU + true + On + false + latest + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + true + + + + + ..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + + + 3.5 + + + ..\..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + + + + ..\..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + 3.0 + + + + 3.5 + + + 3.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SharpLib.sln b/SharpLib.sln deleted file mode 100644 index 49408e4..0000000 --- a/SharpLib.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpLib", "SharpLib.csproj", "{DED134FC-C282-49C9-BA02-3CE6257E91FC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DED134FC-C282-49C9-BA02-3CE6257E91FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DED134FC-C282-49C9-BA02-3CE6257E91FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DED134FC-C282-49C9-BA02-3CE6257E91FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DED134FC-C282-49C9-BA02-3CE6257E91FC}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/UpgradeLog.XML b/UpgradeLog.XML deleted file mode 100644 index 70a8c8b4082e5df2969a6e760d9303aeb1111d7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2482 zcmcJR-%lDr5Xa}aN&kmUUwkRx*`yDqVp_FHo3?3+`qaem;}k3$$WA@I=My!u)k9CaivDNs^(A?v^3xe3L{rQz$ z*a%;#HSrtU5B^4ANV#)`=U#5Twnnd-+a6;*AY5&;ZZGWxF?`3v5Kqd+7%z%Iu`SD| zp#2820q4q9gFAhj_#4WfvUbV2WHXH}`xMJxu-Zan=CM|?{d|9Jo{_TW6Fan@-p38! z23cOjQI=GFJru(>2v6~%8kg}j{Kz3vs@Et ziBZZ?8@05n$6Iw z=R=>Y#x15?gLAoSw?iGRsKM?~Uy|RLB1z`at_%gL=&^iSdXckgO^SFg-mCf z92Fv-@D(@0EY=ip?8OmHUsZW_dyG`x+?)x4RSs!_R2MgX8+EA|8e&(hWn?YzDie2TE4u2I zEDkSRnC^=`xjR10-YVx=(Iz@oF!OcpQ(MiumXBIIP!=a-K{-`jpPJqu@|(J|*(@)5 yd(%$;|2ca2eyT5e`RlJ&L|IW!J(j)g=E16&yu13J_`VJu6JlA7c-?<9b^8Y=HLXqn diff --git a/UpgradeLog.htm b/UpgradeLog.htm deleted file mode 100644 index 0cbd10f24ff9f7dcfdfd8f8f9e7510141fbf8deb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16270 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 diff --git a/XmlFormatter.cs b/XmlFormatter.cs index a1dd373..371b8ca 100644 --- a/XmlFormatter.cs +++ b/XmlFormatter.cs @@ -2,7 +2,7 @@ using System; using System.IO; using System.Xml; using System.Runtime.Serialization; -using System.Web.Configuration; +//using System.Web.Configuration; using System.Collections; using System.Collections.Generic; @@ -20,15 +20,16 @@ namespace lib class XmlFormatter : IFormatter { StreamingContext m_context; - SerializationMode m_mode; + //SerializationMode m_mode; //KnownTypeCollection known_types; - IDataContractSurrogate m_surrogate; + //IDataContractSurrogate m_surrogate; //int m_maxItems; public XmlFormatter() { } + /* public XmlFormatter( SerializationMode mode ) { m_mode = mode; @@ -45,6 +46,7 @@ namespace lib m_mode = mode; m_context = context; } + */ //public XmlFormatter (SerializationMode mode, // StreamingContext context, KnownTypeCollection knownTypes) @@ -69,11 +71,6 @@ namespace lib set { m_context = value; } } - public IDataContractSurrogate DataContractSurrogate - { - get { return m_surrogate; } - set { m_surrogate = value; } - } /* public KnownTypeCollection KnownTypes { @@ -86,10 +83,6 @@ namespace lib } */ - public SerializationMode Mode - { - get { return m_mode; } - } object IFormatter.Deserialize( Stream stream ) { diff --git a/XmlFormatter2.cs b/XmlFormatter2.cs index de25803..a446b1c 100644 --- a/XmlFormatter2.cs +++ b/XmlFormatter2.cs @@ -2,7 +2,7 @@ using System.IO; using System.Xml; using System.Runtime.Serialization; -using System.Web.Configuration; +//using System.Web.Configuration; using System.Collections; using System.Collections.Generic; diff --git a/packages.config b/packages.config deleted file mode 100644 index 62ec3fc..0000000 --- a/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file