Skip to content

Commit

Permalink
- add EyeSoft.Core.Core solution for .NET Core
Browse files Browse the repository at this point in the history
  • Loading branch information
matteomigliore committed May 21, 2018
1 parent 5c4cc72 commit 83a59f2
Show file tree
Hide file tree
Showing 177 changed files with 3,371 additions and 9,093 deletions.
6 changes: 3 additions & 3 deletions EyeSoft - Nuget - Publisher - Helper.linq
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Query Kind="Program">
<Reference Relative="Nuget.Publisher\Core\bin\Debug\Microsoft.Web.XmlTransform.dll">D:\Es.Github\Es.Hsdk\Nuget.Publisher\Core\bin\Debug\Microsoft.Web.XmlTransform.dll</Reference>
<Reference Relative="Nuget.Publisher\Core\bin\Debug\NuGet.Core.dll">D:\Es.Github\Es.Hsdk\Nuget.Publisher\Core\bin\Debug\NuGet.Core.dll</Reference>
<Reference>D:\Es.Github\Es.Hsdk\Nuget.Publisher\Core\bin\Debug\Microsoft.Web.XmlTransform.dll</Reference>
<Reference>D:\Es.Github\Es.Hsdk\Nuget.Publisher\Core\bin\Debug\NuGet.Core.dll</Reference>
<NuGetReference>Castle.WcfIntegrationFacility</NuGetReference>
<NuGetReference>Castle.Windsor</NuGetReference>
<NuGetReference>DotNetZip</NuGetReference>
Expand All @@ -24,7 +24,7 @@ void Main()
/// 3 - Run script
/// NOTE If versions are not equals check if version of projects for different FW on solution if are equals!!

var newVersion = new Version("3.0.6603.29625");
var newVersion = new Version("3.0.6715.33312");

NugetHelper.Pack(true, newVersion);
}
Expand Down
2 changes: 1 addition & 1 deletion Instructions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
2. mount the "Sign\Signing.Certificate.tc" using the password decrypted with "Sign\Picoware.Crypt.Decrypt.Text.linq" qVae26zwSl/pkZNJhpdd0fcUUGnqgUrfFpC1qjrtVCo=
3. build the "Main\EyeSoft.Hsdk.sln" solution
4. obtain the VS_KEY_XXX from Visual Studio
5. add Visual Studio Key command: - run : "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\sn.exe" -i j:\EyeSoft.pfx {VS_KEY_XXXXXXXXXXXXXXXX}
5. add Visual Studio Key command: - run : "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools\sn.exe" -i j:\EyeSoft.pfx {VS_KEY_XXXXXXXXXXXXXXXX}
6. certificate password: tQ4/IFi6ygBlWD+NvCB8OK5s8c+1H6HEtWo/FsVU/lkVFGeC6SbDvYlqLKX5RS2z
44 changes: 14 additions & 30 deletions Main/EyeSoft.Hsdk.Core.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2000
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EyeSoft.Core", "Internal\Core\Source\4.0\Core\EyeSoft.Core.csproj", "{4C464A88-7D14-4755-9EBF-82BBE1B168ED}"
EndProject
Expand All @@ -22,35 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E4E140
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core 2.0", "Core 2.0", "{FB58D100-F137-4195-8F23-A032026E44F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EyeSoft.Core.Core", "Internal\Core\Source\Core\EyeSoft.Core.Core.csproj", "{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE}"
EndProject
Global
GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 4
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = https://picoware.visualstudio.com/defaultcollection
SccProjectUniqueName0 = Internal\\Core\\Source\\4.0\\Core\\EyeSoft.Core.csproj
SccProjectTopLevelParentUniqueName0 = EyeSoft.Hsdk.Core.sln
SccProjectName0 = Internal/Core/Source/4.0/Core
SccAuxPath0 = https://picoware.visualstudio.com/defaultcollection
SccLocalPath0 = Internal\\Core\\Source\\4.0\\Core
SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccProjectUniqueName1 = Internal\\Core\\Source\\4.5\\Core\\EyeSoft.Core.csproj
SccProjectTopLevelParentUniqueName1 = EyeSoft.Hsdk.Core.sln
SccProjectName1 = Internal/Core/Source/4.5/Core
SccAuxPath1 = https://picoware.visualstudio.com/defaultcollection
SccLocalPath1 = Internal\\Core\\Source\\4.5\\Core
SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccProjectUniqueName2 = Internal\\Core\\Source\\4.5\\Core.Test\\EyeSoft.Core.Test.csproj
SccProjectTopLevelParentUniqueName2 = EyeSoft.Hsdk.Core.sln
SccProjectName2 = Internal/Core/Source/4.5/Core.Test
SccAuxPath2 = https://picoware.visualstudio.com/defaultcollection
SccLocalPath2 = Internal\\Core\\Source\\4.5\\Core.Test
SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccProjectUniqueName3 = Internal\\SharpTestsEx.Extensions\\Source\\Extensions\\EyeSoft.SharpTests.Extensions.csproj
SccProjectName3 = Internal/SharpTestsEx.Extensions/Source/Extensions
SccAuxPath3 = https://picoware.visualstudio.com/defaultcollection
SccLocalPath3 = Internal\\SharpTestsEx.Extensions\\Source\\Extensions
SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand All @@ -72,6 +48,10 @@ Global
{F213CB7D-2938-412D-9577-1D59D08753E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F213CB7D-2938-412D-9577-1D59D08753E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F213CB7D-2938-412D-9577-1D59D08753E3}.Release|Any CPU.Build.0 = Release|Any CPU
{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -80,6 +60,10 @@ Global
{4C464A88-7D14-4755-9EBF-82BBE1B168ED} = {4506B456-4D98-4AF1-AA30-1E366E608618}
{0E048E30-4DFC-4362-8056-F809E4AF4FB1} = {E985DF31-7DE1-4B55-85C8-BF61AC0D3BB2}
{9702B58C-F6D0-4A75-A2A8-2F4A847536DD} = {E985DF31-7DE1-4B55-85C8-BF61AC0D3BB2}
{539F9706-4B40-4C5F-BFA1-D5BF0E2077BE} = {FB58D100-F137-4195-8F23-A032026E44F2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7A0C9F9F-F9C7-4CFC-A90D-ECDF786A44F9}
EndGlobalSection
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = a9556ffc-1a6f-449c-a00f-a63aa56560bf
Expand Down
73 changes: 34 additions & 39 deletions Main/Internal/Core/Source/4.0/Core/Calendar/Holiday/AgnosticDay.cs
Original file line number Diff line number Diff line change
@@ -1,42 +1,37 @@
namespace EyeSoft.Calendar
{
using System;

public class AgnosticDay : IComparable<AgnosticDay>
{
public AgnosticDay(int day, int month)
{
Ensure.That(day).Is.Between(1, 31);
Ensure.That(month).Is.Between(1, 12);

Day = day;
Month = month;
}

public int Day { get; private set; }

public int Month { get; private set; }

public int CompareTo(AgnosticDay other)
{
if (Month > other.Month)
{
return 1;
}

if (Month < other.Month)
{
return -1;
}

return Day.CompareTo(other.Day);
}

public override string ToString()
{
return
"Day: {Day} Month: {Month}"
.NamedFormat(Day, Month);
}
}
using System;

public class AgnosticDay : IComparable<AgnosticDay>
{
public AgnosticDay(int day, int month)
{
Day = day;
Month = month;
}

public int Day { get; private set; }

public int Month { get; private set; }

public int CompareTo(AgnosticDay other)
{
if (Month > other.Month)
{
return 1;
}

if (Month < other.Month)
{
return -1;
}

return Day.CompareTo(other.Day);
}

public override string ToString()
{
return $"Day: {Day} Month: {Month}";
}
}
}
99 changes: 49 additions & 50 deletions Main/Internal/Core/Source/4.0/Core/Calendar/Holiday/Holiday.cs
Original file line number Diff line number Diff line change
@@ -1,66 +1,65 @@
namespace EyeSoft.Calendar
{
using System;
using System;

using EyeSoft.Extensions;
using EyeSoft.Extensions;

public class Holiday
{
private Holiday(string name, DateTime date, bool isFixed)
{
Name = name;
Date = date;
IsFixed = isFixed;
}
public class Holiday
{
private Holiday(string name, DateTime date, bool isFixed)
{
Name = name;
Date = date;
IsFixed = isFixed;
}

public string Name { get; private set; }
public string Name { get; private set; }

public DateTime Date { get; private set; }
public DateTime Date { get; private set; }

public bool IsFixed { get; private set; }
public bool IsFixed { get; private set; }

public static Holiday Fixed(string name, DateTime dateTime)
{
return
Create(name, dateTime, true);
}
public static Holiday Fixed(string name, DateTime dateTime)
{
return
Create(name, dateTime, true);
}

public static Holiday Entry(string name, DateTime dateTime)
{
return
Create(name, dateTime, false);
}
public static Holiday Entry(string name, DateTime dateTime)
{
return
Create(name, dateTime, false);
}

public static Holiday Create(string name, DateTime dateTime, bool isFixed)
{
return
new Holiday(name, dateTime, isFixed);
}
public static Holiday Create(string name, DateTime dateTime, bool isFixed)
{
return
new Holiday(name, dateTime, isFixed);
}

public override bool Equals(object obj)
{
if (obj == null || GetType() != obj.GetType())
{
return false;
}
public override bool Equals(object obj)
{
if (obj == null || GetType() != obj.GetType())
{
return false;
}

var other = obj.Convert<Holiday>();
var other = obj.Convert<Holiday>();

return
Name.Equals(other.Name) &&
Date.Equals(other.Date) &&
IsFixed.Equals(other.IsFixed);
}
return
Name.Equals(other.Name) &&
Date.Equals(other.Date) &&
IsFixed.Equals(other.IsFixed);
}

public override int GetHashCode()
{
return ToString().GetHashCode();
}
public override int GetHashCode()
{
return ToString().GetHashCode();
}

public override string ToString()
{
return
"{Description} {Date} /fixed: {Fixed}".NamedFormat(Name, Date.ToInvariantCultureDateString(), IsFixed);
}
}
public override string ToString()
{
return "{Name} {Date.ToInvariantCultureDateString()} /fixed: {IsFixed}";
}
}
}
Loading

0 comments on commit 83a59f2

Please sign in to comment.