diff --git a/RMDataManagerLibrary/RMDataManagerLibrary.csproj b/RMDataManagerLibrary/RMDataManagerLibrary.csproj index bf8a8a6..26d4f56 100644 --- a/RMDataManagerLibrary/RMDataManagerLibrary.csproj +++ b/RMDataManagerLibrary/RMDataManagerLibrary.csproj @@ -1,69 +1,11 @@ - - - - - Debug - AnyCPU - {6669F7DC-4B07-497F-BDEE-5333DB3EDBF4} - Library - Properties - RMDataManagerLibrary - RMDataManagerLibrary - v4.7.2 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Dapper.2.0.123\lib\net461\Dapper.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + netstandard2.0 + false + + + + + + \ No newline at end of file diff --git a/RMWPFInterfaceLibrary/Api/APIHelper.cs b/RMWPFInterfaceLibrary/Api/APIHelper.cs index 6bb6c68..ce2d694 100644 --- a/RMWPFInterfaceLibrary/Api/APIHelper.cs +++ b/RMWPFInterfaceLibrary/Api/APIHelper.cs @@ -32,7 +32,7 @@ namespace RMWPFInterfaceLibrary.Api private void InitializeClient() { string api = ConfigurationManager.AppSettings["api"]; - + _apiClient = new HttpClient(); _apiClient.BaseAddress = new Uri(api); _apiClient.DefaultRequestHeaders.Accept.Clear(); diff --git a/RMWPFInterfaceLibrary/Properties/AssemblyInfo.cs b/RMWPFInterfaceLibrary/Properties/AssemblyInfo.cs deleted file mode 100644 index 80c1c38..0000000 --- a/RMWPFInterfaceLibrary/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("RMWPFInterfaceLibrary")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RMWPFInterfaceLibrary")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[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("10b4a580-f9cf-4483-bf8b-02c5b20f182d")] - -// 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/RMWPFInterfaceLibrary/RMWPFInterfaceLibrary.csproj b/RMWPFInterfaceLibrary/RMWPFInterfaceLibrary.csproj index fee4146..cc0f7f3 100644 --- a/RMWPFInterfaceLibrary/RMWPFInterfaceLibrary.csproj +++ b/RMWPFInterfaceLibrary/RMWPFInterfaceLibrary.csproj @@ -1,75 +1,12 @@ - - - - - Debug - AnyCPU - {10B4A580-F9CF-4483-BF8B-02C5B20F182D} - Library - Properties - RMWPFInterfaceLibrary - RMWPFInterfaceLibrary - v4.7.2 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + netstandard2.0 + + + + + + + + \ No newline at end of file diff --git a/RMWPFInterfaceLibrary/packages.config b/RMWPFInterfaceLibrary/packages.config deleted file mode 100644 index e7a4b49..0000000 --- a/RMWPFInterfaceLibrary/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/RMWPFUserInterface/RMWPFUserInterface.csproj b/RMWPFUserInterface/RMWPFUserInterface.csproj index eb4cf4a..6c4b535 100644 --- a/RMWPFUserInterface/RMWPFUserInterface.csproj +++ b/RMWPFUserInterface/RMWPFUserInterface.csproj @@ -55,7 +55,12 @@ + + ..\packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll @@ -65,6 +70,18 @@ True True + + + ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll + + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + + + diff --git a/RMWPFUserInterface/packages.config b/RMWPFUserInterface/packages.config index 35db186..fa8d510 100644 --- a/RMWPFUserInterface/packages.config +++ b/RMWPFUserInterface/packages.config @@ -6,5 +6,9 @@ + + + + \ No newline at end of file