Merge pull request #38 from alexinea/master

Add DynamicOptipnals and Fluent exception apis.
cosmos-stack · Jan 6, 2020 · eec6eae · eec6eae
2 parents 90d2d1e + 6bc0936
commit eec6eae
Show file tree

Hide file tree

Showing 128 changed files with 6,020 additions and 437 deletions.
diff --git a/Cosmos.Standard.sln b/Cosmos.Standard.sln
@@ -10,8 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		Publish.bat = Publish.bat
-		PublishToMyGet.bat = PublishToMyGet.bat
 		README.md = README.md
+		PublishToMyGet.bat = PublishToMyGet.bat
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0F01E2EF-3398-47CB-B5CB-33AF122A1BC7}"
@@ -165,6 +165,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Test.Serialization.Y
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Extensions.Optionals", "src\Cosmos.Extensions.Optionals\Cosmos.Extensions.Optionals.csproj", "{43F1A15E-04EA-405F-8115-B3DD3DDD6B3B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Serialization.Nett", "extra\serialization\src\Cosmos.Serialization.Nett\Cosmos.Serialization.Nett.csproj", "{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Test.Serialization.NettTest", "extra\serialization\tests\Cosmos.Test.Serialization.NettTest\Cosmos.Test.Serialization.NettTest.csproj", "{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Test.ReflectionTests", "test\Cosmos.Test.ReflectionTests\Cosmos.Test.ReflectionTests.csproj", "{F7ED45F3-8BB1-4620-A267-9F02510134E4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -379,6 +385,18 @@ Global
 		{43F1A15E-04EA-405F-8115-B3DD3DDD6B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43F1A15E-04EA-405F-8115-B3DD3DDD6B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43F1A15E-04EA-405F-8115-B3DD3DDD6B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7ED45F3-8BB1-4620-A267-9F02510134E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7ED45F3-8BB1-4620-A267-9F02510134E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7ED45F3-8BB1-4620-A267-9F02510134E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7ED45F3-8BB1-4620-A267-9F02510134E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -446,6 +464,9 @@ Global
 		{60B1F9E9-300B-4944-8409-B434E6CF9AC2} = {66C97C79-C2AE-49DD-8622-CAC7DD71F21B}
 		{FB8BD44F-F65D-4944-8F1B-CD72CF8EBBAE} = {66C97C79-C2AE-49DD-8622-CAC7DD71F21B}
 		{43F1A15E-04EA-405F-8115-B3DD3DDD6B3B} = {BDBDE50C-D11B-4B8B-8349-0B6681CC98FF}
+		{B1A584BE-EE50-4EF3-AC49-1E3FB91545E2} = {87D7302C-14EA-46B4-9324-0E42E39C100D}
+		{57DA8994-BA86-4FB8-BA92-CFB09FDE0A55} = {66C97C79-C2AE-49DD-8622-CAC7DD71F21B}
+		{F7ED45F3-8BB1-4620-A267-9F02510134E4} = {0F01E2EF-3398-47CB-B5CB-33AF122A1BC7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D68A6AF5-79FE-4679-AD20-67D6CFCF75B4}

diff --git a/Publish.bat b/Publish.bat
@@ -27,12 +27,13 @@ dotnet pack src/Cosmos.Standard -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.serialization.Xml -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Jil -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Lit -c Release -o nuget_pub
+dotnet pack extra/serialization/src/Cosmos.Serialization.Nett -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.serialization.Binary -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Swifter -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Utf8Json -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Protobuf -c Release -o nuget_pub
-dotnet pack extra/serialization/src/Cosmos.Serialization.KoobooJson -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.SharpYaml -c Release -o nuget_pub
+dotnet pack extra/serialization/src/Cosmos.Serialization.KoobooJson -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.YamlDotNet -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.MsgPackCli -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.MessagePack -c Release -o nuget_pub

diff --git a/PublishToMyGet.bat b/PublishToMyGet.bat
@@ -27,12 +27,13 @@ dotnet pack src/Cosmos.Standard -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.serialization.Xml -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Jil -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Lit -c Release -o nuget_pub
+dotnet pack extra/serialization/src/Cosmos.Serialization.Nett -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.serialization.Binary -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Swifter -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Utf8Json -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.Protobuf -c Release -o nuget_pub
-dotnet pack extra/serialization/src/Cosmos.Serialization.KoobooJson -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.SharpYaml -c Release -o nuget_pub
+dotnet pack extra/serialization/src/Cosmos.Serialization.KoobooJson -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.YamlDotNet -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.MsgPackCli -c Release -o nuget_pub
 dotnet pack extra/serialization/src/Cosmos.Serialization.MessagePack -c Release -o nuget_pub

diff --git a/README.md b/README.md
@@ -46,4 +46,4 @@ People or projects that have made a great contribbution to this project:
 
 Member project of [Cosmosloops Labs.](https://github.com/cosmos-loops).
 
-[Apache 2.0 License](/LICENSE)
+[Apache License 2.0](/LICENSE)
diff --git a/build/misc.props b/build/misc.props
@@ -9,6 +9,6 @@
 
 	<ItemGroup>
 		<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath=""/>
-		<None Include="..\..\msic\images\icon.png" Pack="true" PackagePath=""/>
+		<None Include="..\..\misc\images\icon.png" Pack="true" PackagePath=""/>
 	</ItemGroup>
 </Project>
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>0</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>2-alpha2-100011</VersionPatch>
+		<VersionPatch>2-beta1-101136</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>

diff --git a/extra/dependency/build/misc.props b/extra/dependency/build/misc.props
@@ -9,6 +9,6 @@
 
 	<ItemGroup>
 		<None Include="..\..\..\..\LICENSE" Pack="true" Visible="false" PackagePath=""/>
-		<None Include="..\..\..\..\msic\images\icon.png" Pack="true" Visible="false" PackagePath=""/>
+		<None Include="..\..\..\..\misc\images\icon.png" Pack="true" Visible="false" PackagePath=""/>
 	</ItemGroup>
 </Project>
diff --git a/extra/http/build/misc.props b/extra/http/build/misc.props
@@ -9,6 +9,6 @@
 
     <ItemGroup>
         <None Include="..\..\..\..\LICENSE" Pack="true" Visible="false" PackagePath="" />
-        <None Include="..\..\..\..\msic\images\icon.png" Pack="true" Visible="false" PackagePath="" />
+        <None Include="..\..\..\..\misc\images\icon.png" Pack="true" Visible="false" PackagePath="" />
     </ItemGroup>
 </Project>
diff --git a/extra/http/src/Cosmos.Extensions.Http/Cosmos.Extensions.Http.csproj b/extra/http/src/Cosmos.Extensions.Http/Cosmos.Extensions.Http.csproj
@@ -16,7 +16,7 @@
                           '$(TargetFramework)'=='netstandard2.1' OR 
                           '$(TargetFramework)'=='netstandard2.0' OR 
                           '$(TargetFramework)'=='net461'">
-        <PackageReference Include="System.Reactive" Version="4.3.1"/>
+        <PackageReference Include="System.Reactive" Version="4.3.2"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)'=='net451'">

diff --git a/extra/serialization/README.MD b/extra/serialization/README.MD
@@ -17,6 +17,8 @@ Cosmos.Serialization provides several serializers and extensions:
 - Yaml
   - Cosmos.Serialization.YamlDotNet
   - Cosmos.Serialization.SharpYaml
+- Toml
+  - Cosmos.Serialization.Nett
 - Binary
   - Cosmos.Serialization.Binary
 - Protobuf

diff --git a/extra/serialization/build/misc.props b/extra/serialization/build/misc.props
@@ -9,6 +9,6 @@
 
     <ItemGroup>
         <None Include="..\..\..\..\LICENSE" Pack="true" Visible="false" PackagePath="" />
-        <None Include="..\..\..\..\msic\images\icon.png" Pack="true" Visible="false" PackagePath="" />
+        <None Include="..\..\..\..\misc\images\icon.png" Pack="true" Visible="false" PackagePath="" />
     </ItemGroup>
 </Project>
diff --git a/extra/serialization/src/Cosmos.Serialization.Nett/Cosmos.Serialization.Nett.csproj b/extra/serialization/src/Cosmos.Serialization.Nett/Cosmos.Serialization.Nett.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\build\common.props" />
+
+    <PropertyGroup>
+        <TargetFrameworks>netcoreapp3.1;netstandard2.1;netstandard2.0;net461;net451</TargetFrameworks>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AssemblyName>Cosmos.Serialization.Nett</AssemblyName>
+        <PackageId>Cosmos.Serialization.Nett</PackageId>
+        <Description>Nett TOML serializer extension for Cosmos base library</Description>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Nett" Version="0.13.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\src\Cosmos.Extensions\Cosmos.Extensions.csproj" />
+    </ItemGroup>
+
+</Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,4 +46,4 @@ People or projects that have made a great contribbution to this project:

		Member project of [Cosmosloops Labs.](https://github.com/cosmos-loops).

		[Apache 2.0 License](/LICENSE)
		[Apache License 2.0](/LICENSE)