make packable, in theory

steverichey · steverichey · commit fb8efb317da2 · 2019-01-26T16:26:30.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,8 @@ install:
 script:
   - dotnet build Float.xAPI/Float.xAPI.fsproj
   - dotnet test Float.xAPI.Tests/Float.xAPI.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  - dotnet pack Float.xAPI/Float.xAPI.fsproj /p:Configuration=Release
+  - dotnet pack Float.xAPI/Float.xAPI.fsproj /p:Configuration=Release /p:PackageVersion=0.0.1
+  - dotnet nuget push Float.xAPI/bin/Release/*.nupkg -Verbosity detailed -ApiKey $NUGET_KEY -Source $NUGET_SOURCE
 after_success:
   - curl -s https://codecov.io/bash > codecov
   - chmod +x codecov
diff --git a/Float.Common/Float.Common.fsproj b/Float.Common/Float.Common.fsproj
diff --git a/Float.VSDocGen/Float.VSDocGen.fsproj b/Float.VSDocGen/Float.VSDocGen.fsproj
@@ -56,11 +56,5 @@
     <Compile Include="Program.fs" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Float.Common\Float.Common.fsproj">
-      <Project>{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}</Project>
-      <Name>Float.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(FSharpTargetsPath)" />
 </Project>
diff --git a/Float.VSDocGen/Member.fs b/Float.VSDocGen/Member.fs
@@ -5,7 +5,7 @@
 
 namespace Float.VSDocGen
 
-open Float.Common.Interop
+//open Float.Interop
 
 /// <summary>
 /// Nearly all useful information in the parsed XML is in the form of a member of some class.
diff --git a/Float.VSDocGen/Program.fs b/Float.VSDocGen/Program.fs
@@ -7,7 +7,7 @@ namespace Float.VSDocGen
 
 open System.IO
 open System
-open Float.Common.Interop
+//open Float.Interop
 open FSharp.Data
 open System.Xml
 open System.Xml.Linq
diff --git a/Float.xAPI.sln b/Float.xAPI.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Float.xAPI.Tests", "Float.x
 EndProject
 Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "Float.VSDocGen", "Float.VSDocGen\Float.VSDocGen.fsproj", "{FCC39507-2418-47B9-A290-512DAE0B6BFE}"
 EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "Float.Common", "Float.Common\Float.Common.fsproj", "{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,10 +25,6 @@ Global
 		{FCC39507-2418-47B9-A290-512DAE0B6BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCC39507-2418-47B9-A290-512DAE0B6BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCC39507-2418-47B9-A290-512DAE0B6BFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F7D8D7D-C0FB-462A-B7DF-F6D348A8C9D0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
diff --git a/Float.xAPI/Activities/Activity.fs b/Float.xAPI/Activities/Activity.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities.Definitions
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A Statement can represent an Activity as the Object of the Statement.
diff --git a/Float.xAPI/Activities/ContextActivities.fs b/Float.xAPI/Activities/ContextActivities.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Activities
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A map of the types of learning activity context that this Statement is related to.
diff --git a/Float.xAPI/Activities/Definitions/ActivityDefinition.fs b/Float.xAPI/Activities/Definitions/ActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Languages
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// Metadata associated with an activity.
diff --git a/Float.xAPI/Activities/Definitions/CharacterString.fs b/Float.xAPI/Activities/Definitions/CharacterString.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Activities.Definitions
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/CharacterStringNumeric.fs b/Float.xAPI/Activities/Definitions/CharacterStringNumeric.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Activities.Definitions
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A range of numbers represented by a minimum and maximum.
diff --git a/Float.xAPI/Activities/Definitions/CharacterStringPair.fs b/Float.xAPI/Activities/Definitions/CharacterStringPair.fs
@@ -7,7 +7,7 @@ namespace Float.xAPI.Activities.Definitions
 
 open System.Collections.Generic
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/ChoiceInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/ChoiceInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/FillInInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/FillInInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/InteractionComponent.fs b/Float.xAPI/Activities/Definitions/InteractionComponent.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Languages
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A choice within an interaction component.
diff --git a/Float.xAPI/Activities/Definitions/LikertInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/LikertInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/LongFillInInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/LongFillInInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/MatchingInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/MatchingInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/NumericInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/NumericInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/OtherInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/OtherInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/PerformanceInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/PerformanceInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/ResponsePattern.fs b/Float.xAPI/Activities/Definitions/ResponsePattern.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Activities.Definitions
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// The Correct Responses Pattern contains an array of response patterns.
diff --git a/Float.xAPI/Activities/Definitions/SequencingInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/SequencingInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Activities/Definitions/TrueFalseInteractionActivityDefinition.fs b/Float.xAPI/Activities/Definitions/TrueFalseInteractionActivityDefinition.fs
@@ -9,7 +9,7 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Activities
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI.Languages
 
 /// <summary>
diff --git a/Float.xAPI/Actor/Agent.fs b/Float.xAPI/Actor/Agent.fs
@@ -8,7 +8,7 @@ namespace Float.xAPI.Actor
 open System.Runtime.InteropServices
 open Float.xAPI
 open Float.xAPI.Actor.Identifier
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// An Agent (an individual) is a persona or system.
diff --git a/Float.xAPI/Actor/AnonymousGroup.fs b/Float.xAPI/Actor/AnonymousGroup.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI
 
 /// <summary>
diff --git a/Float.xAPI/Actor/IdentifiedGroup.fs b/Float.xAPI/Actor/IdentifiedGroup.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor
 
 open System.Runtime.InteropServices
-open Float.Common.Interop
+open Float.Interop
 open Float.xAPI
 open Float.xAPI.Actor.Identifier
 
diff --git a/Float.xAPI/Actor/Identifier/Account.fs b/Float.xAPI/Actor/Identifier/Account.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor.Identifier
 
 open System
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A user account on an existing system, such as a private system (LMS or intranet) or a public system (social networking site).
diff --git a/Float.xAPI/Actor/Identifier/Mailbox.fs b/Float.xAPI/Actor/Identifier/Mailbox.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor.Identifier
 
 open System.Net.Mail
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// A personal mailbox, ie. an Internet mailbox associated with exactly one owner, the first owner of this mailbox.
diff --git a/Float.xAPI/Actor/Identifier/MailboxSha1Sum.fs b/Float.xAPI/Actor/Identifier/MailboxSha1Sum.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor.Identifier
 
 open Float.xAPI
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// The sha1sum of the URI of an Internet mailbox associated with exactly one owner, the first owner of the mailbox.
diff --git a/Float.xAPI/Actor/Identifier/OpenID.fs b/Float.xAPI/Actor/Identifier/OpenID.fs
@@ -6,7 +6,7 @@
 namespace Float.xAPI.Actor.Identifier
 
 open System
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// An openID that uniquely identifies the Agent.
diff --git a/Float.xAPI/Attachment.fs b/Float.xAPI/Attachment.fs
@@ -9,7 +9,7 @@ open System
 open System.Net.Mime
 open System.Runtime.InteropServices
 open Float.xAPI.Languages
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// In some cases an Attachment is logically an important part of a Learning Record.
diff --git a/Float.xAPI/Context.fs b/Float.xAPI/Context.fs
@@ -9,8 +9,8 @@ open System
 open System.Runtime.InteropServices
 open Float.xAPI.Actor
 open Float.xAPI.Activities
-open Float.Common.Interop
 open Float.xAPI.Languages
+open Float.Interop
 
 [<NoEquality;NoComparison;Struct>]
 type public Context =
diff --git a/Float.xAPI/Float.xAPI.fsproj b/Float.xAPI/Float.xAPI.fsproj
@@ -1,7 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ReleaseVersion>0.0.1</ReleaseVersion>
+    <PackOnBuild>true</PackOnBuild>
+    <PackageId>Float.xAPI</PackageId>
+    <Authors>Float</Authors>
+    <Owners>Float</Owners>
+    <License>MIT</License>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/gowithfloat/xapi</PackageProjectUrl>
+    <Summary>An F# implementation of the xAPI specification with a focus on type safety and immutability.</Summary>
+    <Title>Float.xAPI</Title>
+    <Description>An F# implementation of the xAPI specification with a focus on type safety and immutability.</Description>
+    <Copyright>Copyright (c) 2018 Float, All rights reserved. Shared under an MIT license.</Copyright>
+    <Tags>xapi</Tags>
+    <RepositoryUrl>https://github.com/gowithfloat/xapi</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DocumentationFile>bin\Debug\netstandard2.0\Float.xAPI.XML</DocumentationFile>
@@ -17,6 +30,7 @@
     <Folder Include="Resources\Documents\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interop.fs" />
     <Compile Include="IDictionaryRepresentable.fs" />
     <Compile Include="SHAHash.fs" />
     <Compile Include="IObject.fs" />
@@ -90,7 +104,4 @@
     <Compile Include="InMemoryLRS.fs" />
     <Compile Include="NoopLRS.fs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Float.Common\Float.Common.fsproj" />
-  </ItemGroup>
 </Project>
diff --git a/Float.xAPI/Interop.fs b/Float.xAPI/Interop.fs
@@ -3,7 +3,7 @@
 // Shared under an MIT license. See license.md for details.
 // </copyright>
 
-namespace Float.Common
+namespace Float
 
 open System
 open System.Text
@@ -28,6 +28,9 @@ module Interop =
     let inline nullArg x name =
         if (isNull (box x)) then raise (ArgumentNullException name)
 
+    //let inline defaultArg<'T when 'T :> struct>(x: 'T, name: string) =
+        //if (x = 'T()) then raise (ArgumentException name)
+
     /// <summary>
     /// Raise an argument exception if the given sequence is empty.
     /// </summary>
diff --git a/Float.xAPI/Languages/ExtendedLanguage.fs b/Float.xAPI/Languages/ExtendedLanguage.fs
@@ -5,7 +5,7 @@
 
 namespace Float.xAPI.Languages
 
-open Float.Common.Interop
+open Float.Interop
 
 // todo: extended language subtags should be tied to specific languages only (the registry specifies the parent tag)
 
diff --git a/Float.xAPI/Languages/Language.fs b/Float.xAPI/Languages/Language.fs
@@ -5,7 +5,7 @@
 
 namespace Float.xAPI.Languages
 
-open Float.Common.Interop
+open Float.Interop
 
 /// <summary>
 /// ISO 639-1 Language Codes
diff --git a/Float.xAPI/Languages/LanguageMap.fs b/Float.xAPI/Languages/LanguageMap.fs
diff --git a/Float.xAPI/Languages/LanguageTag.fs b/Float.xAPI/Languages/LanguageTag.fs
diff --git a/Float.xAPI/Languages/Region.fs b/Float.xAPI/Languages/Region.fs
diff --git a/Float.xAPI/Resources/Documents/Document.fs b/Float.xAPI/Resources/Documents/Document.fs
diff --git a/Float.xAPI/Resources/StatementResult.fs b/Float.xAPI/Resources/StatementResult.fs
diff --git a/Float.xAPI/Result.fs b/Float.xAPI/Result.fs
diff --git a/Float.xAPI/SHAHash.fs b/Float.xAPI/SHAHash.fs
diff --git a/Float.xAPI/Score.fs b/Float.xAPI/Score.fs
diff --git a/Float.xAPI/Statement.fs b/Float.xAPI/Statement.fs
diff --git a/Float.xAPI/StatementReference.fs b/Float.xAPI/StatementReference.fs
diff --git a/Float.xAPI/SubStatement.fs b/Float.xAPI/SubStatement.fs
diff --git a/Float.xAPI/Verb.fs b/Float.xAPI/Verb.fs
