diff --git a/.vs/DeskHubSharp/v15/.suo b/.vs/DeskHubSharp/v15/.suo index 9ddf93f..54a069b 100644 Binary files a/.vs/DeskHubSharp/v15/.suo and b/.vs/DeskHubSharp/v15/.suo differ diff --git a/.vs/DeskHubSharp/v15/Server/sqlite3/storage.ide b/.vs/DeskHubSharp/v15/Server/sqlite3/storage.ide index 38364c7..3f0a262 100644 Binary files a/.vs/DeskHubSharp/v15/Server/sqlite3/storage.ide and b/.vs/DeskHubSharp/v15/Server/sqlite3/storage.ide differ diff --git a/DeskHubSharp.Models/AssemblyInfo.fs b/DeskHubSharp.Models/AssemblyInfo.fs new file mode 100644 index 0000000..ec0ae8b --- /dev/null +++ b/DeskHubSharp.Models/AssemblyInfo.fs @@ -0,0 +1,41 @@ +namespace DeskHubSharp.Models.AssemblyInfo + +open System.Reflection +open System.Runtime.CompilerServices +open 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. +[] +[] +[] +[] +[] +[] +[] +[] + +// 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. +[] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[] + +// 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: +// [] +[] +[] + +do + () \ No newline at end of file diff --git a/DeskHubSharp.Models/DeskHubSharp.Models.fsproj b/DeskHubSharp.Models/DeskHubSharp.Models.fsproj index df45432..d1b580d 100644 --- a/DeskHubSharp.Models/DeskHubSharp.Models.fsproj +++ b/DeskHubSharp.Models/DeskHubSharp.Models.fsproj @@ -1,11 +1,69 @@ - - + + + - netstandard2.0 + Debug + AnyCPU + 2.0 + 8bda59ae-1de9-4049-8929-0eaa58f28e68 + Library + DeskHubSharp.Models + DeskHubSharp.Models + true + v4.6.1 + true + DeskHubSharp.Models - + + true + full + false + false + bin\$(Configuration)\ + DEBUG;TRACE + 3 + bin\$(Configuration)\$(AssemblyName).XML + + + pdbonly + true + true + bin\$(Configuration)\ + TRACE + 3 + bin\$(Configuration)\$(AssemblyName).XML + + + 11 + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + - + + + + - - + + + ..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll + + + + + + + ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + True + + + + \ No newline at end of file diff --git a/DeskHubSharp.Models/Email.fs b/DeskHubSharp.Models/Email.fs index e449798..589dc59 100644 --- a/DeskHubSharp.Models/Email.fs +++ b/DeskHubSharp.Models/Email.fs @@ -1,6 +1,6 @@ -module Email +namespace DeskHubSharp.Models - type EmailModel (fromEmail: string, toEmail: string, password: string) = - member x.fromEmail = fromEmail - member x.toEmail = toEmail - member x.password = "password" \ No newline at end of file + type EmailModel() = + member this.FromEmail = "wjmiller2016@gmail.com" + member this.ToEmail = "wjmiller2016@gmail.com" + member this.Password = "password" diff --git a/DeskHubSharp.Models/Error.fs b/DeskHubSharp.Models/Error.fs new file mode 100644 index 0000000..19f1302 --- /dev/null +++ b/DeskHubSharp.Models/Error.fs @@ -0,0 +1,3 @@ +module Error + +// This file is to test out file IO and exceptions \ No newline at end of file diff --git a/DeskHubSharp.Models/Library.fs b/DeskHubSharp.Models/Library.fs deleted file mode 100644 index ae75e1d..0000000 --- a/DeskHubSharp.Models/Library.fs +++ /dev/null @@ -1,5 +0,0 @@ -namespace DeskHubSharp.Models - -module Say = - let hello name = - printfn "Hello %s" name diff --git a/DeskHubSharp.Models/Math.fs b/DeskHubSharp.Models/Math.fs new file mode 100644 index 0000000..a30b875 --- /dev/null +++ b/DeskHubSharp.Models/Math.fs @@ -0,0 +1,9 @@ +module Math + +let addOne x = x + 1 + +let square x = x * x + +let slash x = x / x + +let recursive x = 1 / x \ No newline at end of file diff --git a/DeskHubSharp.Models/Opener.fs b/DeskHubSharp.Models/Opener.fs new file mode 100644 index 0000000..863e5d4 --- /dev/null +++ b/DeskHubSharp.Models/Opener.fs @@ -0,0 +1,15 @@ +module Opener + +open System.IO +open System.Diagnostics + +let file = + try + use file = File.OpenRead "config.xml" + Some <| file.Read + with + :? FileNotFoundException as ex -> + printfn "%s was not found. Does it exist?" ex.FileName + None + _ -> printfn "Error loading file..." + reraise() diff --git a/DeskHubSharp.Models/Script.fsx b/DeskHubSharp.Models/Script.fsx new file mode 100644 index 0000000..38ea6db --- /dev/null +++ b/DeskHubSharp.Models/Script.fsx @@ -0,0 +1,8 @@ +// Learn more about F# at http://fsharp.org +// See the 'F# Tutorial' project for more help. + +#load "Email.fs" +open DeskHubSharp.Models + +// Define your library scripting code here + diff --git a/DeskHubSharp.Models/packages.config b/DeskHubSharp.Models/packages.config new file mode 100644 index 0000000..49a5af8 --- /dev/null +++ b/DeskHubSharp.Models/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/DeskHubSharp.sln b/DeskHubSharp.sln index 1aeb579..5ef42dc 100644 --- a/DeskHubSharp.sln +++ b/DeskHubSharp.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.28010.2046 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeskHubSharp", "DeskHubSharp\DeskHubSharp.csproj", "{BB23F915-21F5-4201-9021-0BE824660DBC}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DeskHubSharp.Models", "DeskHubSharp.Models\DeskHubSharp.Models.fsproj", "{AC090BDC-3D12-4F61-B4EE-145BADEB3AC6}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DeskHubSharp.Models", "DeskHubSharp.Models\DeskHubSharp.Models.fsproj", "{8BDA59AE-1DE9-4049-8929-0EAA58F28E68}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {BB23F915-21F5-4201-9021-0BE824660DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB23F915-21F5-4201-9021-0BE824660DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB23F915-21F5-4201-9021-0BE824660DBC}.Release|Any CPU.Build.0 = Release|Any CPU - {AC090BDC-3D12-4F61-B4EE-145BADEB3AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC090BDC-3D12-4F61-B4EE-145BADEB3AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC090BDC-3D12-4F61-B4EE-145BADEB3AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC090BDC-3D12-4F61-B4EE-145BADEB3AC6}.Release|Any CPU.Build.0 = Release|Any CPU + {8BDA59AE-1DE9-4049-8929-0EAA58F28E68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BDA59AE-1DE9-4049-8929-0EAA58F28E68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BDA59AE-1DE9-4049-8929-0EAA58F28E68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BDA59AE-1DE9-4049-8929-0EAA58F28E68}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DeskHubSharp/BusinessLayer/EmailBLL.cs b/DeskHubSharp/BusinessLayer/EmailBLL.cs index f83e86d..ce563d7 100644 --- a/DeskHubSharp/BusinessLayer/EmailBLL.cs +++ b/DeskHubSharp/BusinessLayer/EmailBLL.cs @@ -8,6 +8,7 @@ using MailKit; using MailKit.Net.Smtp; using MailKit.Security; using MimeKit; +using DeskHubSharp.Models; namespace DeskHubSharp { diff --git a/DeskHubSharp/DeskHubSharp.csproj b/DeskHubSharp/DeskHubSharp.csproj index e25d345..a01cc1a 100644 --- a/DeskHubSharp/DeskHubSharp.csproj +++ b/DeskHubSharp/DeskHubSharp.csproj @@ -165,9 +165,14 @@ - + + + {8bda59ae-1de9-4049-8929-0eaa58f28e68} + DeskHubSharp.Models + + \ No newline at end of file