diff --git a/ChangeLog b/ChangeLog index 66cd03d2..1eff34ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-06-09 Paul Schneider + + * Yavsc.sln: creates a packaging project + 2015-06-07 Paul Schneider * Makefile: cleans the StyleCop cache diff --git a/ITContentProvider/ChangeLog b/ITContentProvider/ChangeLog new file mode 100644 index 00000000..db3b2e84 --- /dev/null +++ b/ITContentProvider/ChangeLog @@ -0,0 +1,5 @@ +2015-06-09 Paul Schneider + + * ITContentProvider.csproj: Helps to fix packaging, and cleans + dependencies + diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index ea7cb9ca..5dc3f566 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -39,9 +39,6 @@ - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog new file mode 100644 index 00000000..26307ecd --- /dev/null +++ b/NpgsqlBlogProvider/ChangeLog @@ -0,0 +1,5 @@ +2015-06-09 Paul Schneider + + * NpgsqlBlogProvider.csproj: Helps to fix packaging, and + cleans dependencies + diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index f65a05d4..025a56fb 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -43,9 +43,6 @@ - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog new file mode 100644 index 00000000..4f9894ec --- /dev/null +++ b/NpgsqlContentProvider/ChangeLog @@ -0,0 +1,5 @@ +2015-06-09 Paul Schneider + + * NpgsqlContentProvider.csproj: Helps to fix packaging, and + cleans dependencies + diff --git a/NpgsqlContentProvider/NpgsqlContentProvider.csproj b/NpgsqlContentProvider/NpgsqlContentProvider.csproj index c93a7d13..a402c4bc 100644 --- a/NpgsqlContentProvider/NpgsqlContentProvider.csproj +++ b/NpgsqlContentProvider/NpgsqlContentProvider.csproj @@ -35,17 +35,11 @@ - - ..\..\..\..\..\usr\lib\mono\4.5\System.Net.Http.Formatting.dll - False - + - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll @@ -64,4 +58,4 @@ - \ No newline at end of file + diff --git a/NpgsqlMRPProviders/ChangeLog b/NpgsqlMRPProviders/ChangeLog new file mode 100644 index 00000000..50722d8a --- /dev/null +++ b/NpgsqlMRPProviders/ChangeLog @@ -0,0 +1,7 @@ +2015-06-09 Paul Schneider + + * NpgsqlCircleProvider.cs: Refactoring: Npgsql prefix + + * NpgsqlMRPProviders.csproj: Helps to fix packaging, and + cleans dependencies + diff --git a/NpgsqlMRPProviders/NpgsqlCircleProvider.cs b/NpgsqlMRPProviders/NpgsqlCircleProvider.cs new file mode 100644 index 00000000..ee6e8a1d --- /dev/null +++ b/NpgsqlMRPProviders/NpgsqlCircleProvider.cs @@ -0,0 +1,32 @@ +// +// CircleProvider.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; + +namespace Npgsql.Web +{ + public class NpgsqlCircleProvider + { + public NpgsqlCircleProvider () + { + } + } +} + diff --git a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj index 4d1e9aae..433a103c 100644 --- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj +++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj @@ -36,6 +36,7 @@ + @@ -46,9 +47,6 @@ - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll diff --git a/Yavsc.sln b/Yavsc.sln index a6ddc9bb..1d399537 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "pkg", "pkg\pkg.mdproj", "{C6DBD1DC-B619-4DC7-BC92-15693508541E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -69,6 +71,8 @@ Global {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.Build.0 = Release|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/pkg/ChangeLog b/pkg/ChangeLog new file mode 100644 index 00000000..f7d7adc9 --- /dev/null +++ b/pkg/ChangeLog @@ -0,0 +1,4 @@ +2015-06-09 Paul Schneider + + * pkg.mdproj: creates a packaging project + diff --git a/pkg/pkg.mdproj b/pkg/pkg.mdproj new file mode 100644 index 00000000..3e50186a --- /dev/null +++ b/pkg/pkg.mdproj @@ -0,0 +1,40 @@ + + + + PackagingProject + 8.0.30703 + 2.0 + {C6DBD1DC-B619-4DC7-BC92-15693508541E} + + + + + + + + + + + + + + + + + + + + Web,ProgramFiles,MarkdownDeep.dll + Web,ProgramFiles,Mono.Security.dll + Web,ProgramFiles,Npgsql.dll + Web,ProgramFiles,Yavsc.dll.mdb + Web,ProgramFiles,xunit.abstractions.dll + Web,ProgramFiles,xunit.dll + + + + + + + + \ No newline at end of file diff --git a/web/ApiControllers/CircleController.cs b/web/ApiControllers/CircleController.cs new file mode 100644 index 00000000..46abea47 --- /dev/null +++ b/web/ApiControllers/CircleController.cs @@ -0,0 +1,58 @@ +// +// CircleController.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using System.Web.Http; + +namespace Yavsc.ApiControllers +{ + /// + /// Circle controller. + /// + public class CircleController : ApiController + { + /// + /// Add the specified id and users. + /// + /// Identifier. + /// Users. + public void Add(string id, string [] users) + { + throw new NotImplementedException (); + } + /// + /// Delete the specified id. + /// + /// Identifier. + public void Delete(string id) + { + throw new NotImplementedException (); + } + /// + /// Get the specified id. + /// + /// Identifier. + public string[] Get(string id) + { + throw new NotImplementedException (); + } + } +} + diff --git a/web/ChangeLog b/web/ChangeLog index cd386431..88a1d8f4 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,15 @@ +2015-06-09 Paul Schneider + + * CircleController.cs: adds a Circle controller + + * NUnitTestClass.cs: xml doc + + * Web.config: + * Web.csproj: + * TestExec.cs: + * packages.config: + * TestByteA.cs: trying to use xUnit + 2015-06-07 Paul Schneider * CalendarController.cs: removes useless spaces diff --git a/web/NUnitTestClass.cs b/web/NUnitTestClass.cs new file mode 100644 index 00000000..c5f511b3 --- /dev/null +++ b/web/NUnitTestClass.cs @@ -0,0 +1,41 @@ +// +// NUnitTestClass.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using NUnit.Framework; +using System; + +namespace Yavsc +{ + /// + /// N unit test class. + /// + [TestFixture ()] + public class NUnitTestClass + { + /// + /// Tests the case. + /// + [Test ()] + public void TestCase () + { + } + } +} + diff --git a/web/Test/TestByteA.cs b/web/Test/TestByteA.cs index 7ff15720..202b97d5 100644 --- a/web/Test/TestByteA.cs +++ b/web/Test/TestByteA.cs @@ -1,18 +1,19 @@ #if TEST using NUnit.Framework; using System; -using System.Configuration; using Npgsql; +using System.Web.Configuration; namespace Yavsc { [TestFixture ()] public class TestByteA: IDisposable { - //string cnxName = "yavsc"; + string cnxName = "yavsc"; + string ConnectionString { get { - return "Server=127.0.0.1;Port=5432;Database=mae;User Id=mae;Password=admin;Encoding=Unicode;" ; - // return ConfigurationManager.ConnectionStrings [cnxName].ConnectionString; + return "Server=127.0.0.1;Port=5432;Database=YavscDev;User Id=yavscdev;Password=admin;Encoding=Unicode;" ; + // Why? not this : return WebConfigurationManager.ConnectionStrings [cnxName].ConnectionString; } } diff --git a/web/TestExec.cs b/web/TestExec.cs new file mode 100644 index 00000000..2456f038 --- /dev/null +++ b/web/TestExec.cs @@ -0,0 +1,42 @@ +// +// TestExec.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using Xunit; + +namespace Yavsc +{ + /// + /// Test exec. + /// + + public class TestExec + { + /// + /// As the test. + /// + [Fact] + public void ATest () + { + Assert.True (true); + } + } +} + diff --git a/web/Web.config b/web/Web.config index 1853e6f9..b4c5a33e 100644 --- a/web/Web.config +++ b/web/Web.config @@ -45,6 +45,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx + diff --git a/web/Web.csproj b/web/Web.csproj index 87a43d93..8c1271b1 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -16,7 +16,7 @@ full false bin - DEBUG; + DEBUG;TEST;TRACE prompt 4 false @@ -55,9 +55,6 @@ - - ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - @@ -78,18 +75,24 @@ - - ..\packages\Npgsql.2.2.5\lib\net45\Mono.Security.dll - ..\packages\Npgsql.2.2.5\lib\net45\Npgsql.dll - - ..\packages\PayPalCoreSDK.1.6.2\lib\net451\PayPalCoreSDK.dll - ..\packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll + + nunit + + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + @@ -182,6 +185,9 @@ + + + @@ -337,6 +343,7 @@ + diff --git a/web/packages.config b/web/packages.config index 60298091..2c349616 100644 --- a/web/packages.config +++ b/web/packages.config @@ -11,4 +11,9 @@ + + + + + \ No newline at end of file diff --git a/yavscclient/ChangeLog b/yavscclient/ChangeLog new file mode 100644 index 00000000..aa576ceb --- /dev/null +++ b/yavscclient/ChangeLog @@ -0,0 +1,5 @@ +2015-06-09 Paul Schneider + + * YavscClient.csproj: Helps to fix packaging, and cleans + dependencies + diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj index d295b457..35150d41 100644 --- a/yavscclient/YavscClient.csproj +++ b/yavscclient/YavscClient.csproj @@ -36,10 +36,7 @@ - - ..\..\..\..\..\usr\lib\mono\4.5\System.Net.Http.Formatting.dll - - + @@ -56,4 +53,4 @@ YavscModel - \ No newline at end of file +