Merge pull request #1567 from libgit2/remove-epoch

Remove Epoch helper class

Author: ethomson

LibGit2Sharp.Tests/CommitFixture.cs

@@ -475,12 +475,12 @@ public void CanReadCommitData()
                 Assert.NotNull(commit.Author);
                 Assert.Equal("Scott Chacon", commit.Author.Name);
                 Assert.Equal("schacon@gmail.com", commit.Author.Email);
-                Assert.Equal(1273360386, commit.Author.When.ToSecondsSinceEpoch());
+                Assert.Equal(1273360386, commit.Author.When.ToUnixTimeSeconds());
 
                 Assert.NotNull(commit.Committer);
                 Assert.Equal("Scott Chacon", commit.Committer.Name);
                 Assert.Equal("schacon@gmail.com", commit.Committer.Email);
-                Assert.Equal(1273360386, commit.Committer.When.ToSecondsSinceEpoch());
+                Assert.Equal(1273360386, commit.Committer.When.ToUnixTimeSeconds());
 
                 Assert.Equal("181037049a54a1eb5fab404658a3a250b44335d7", commit.Tree.Sha);
 
@@ -889,9 +889,9 @@ public void CanCorrectlyDistinguishAuthorFromCommitter()
             using (var repo = new Repository(path))
             {
                 var author = new Signature("Wilbert van Dolleweerd", "getit@xs4all.nl",
-                                           Epoch.ToDateTimeOffset(1244187936, 120));
+                                           DateTimeOffset.FromUnixTimeSeconds(1244187936).ToOffset(TimeSpan.FromMinutes(120)));
                 var committer = new Signature("Henk Westhuis", "Henk_Westhuis@hotmail.com",
-                                           Epoch.ToDateTimeOffset(1244286496, 120));
+                                           DateTimeOffset.FromUnixTimeSeconds(1244286496).ToOffset(TimeSpan.FromMinutes(120)));
 
                 Commit c = repo.Commit("I can haz an author and a committer!", author, committer);
 

LibGit2Sharp.Tests/EpochFixture.cs

@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\LibGit2Sharp\Core\Epoch.cs" Link="TestHelpers\Epoch.cs" />
     <Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
     <Compile Remove="desktop\**" Condition=" '$(TargetFramework)' != 'net461' " />
   </ItemGroup>

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -10,7 +10,7 @@ namespace LibGit2Sharp.Tests
     public class NoteFixture : BaseFixture
     {
         private static readonly Signature signatureNullToken = new Signature("nulltoken", "emeric.fermas@gmail.com", DateTimeOffset.UtcNow);
-        private static readonly Signature signatureYorah = new Signature("yorah", "yoram.harmelin@gmail.com", Epoch.ToDateTimeOffset(1300557894, 60));
+        private static readonly Signature signatureYorah = new Signature("yorah", "yoram.harmelin@gmail.com", DateTimeOffset.FromUnixTimeSeconds(1300557894).ToOffset(TimeSpan.FromMinutes(60)));
 
         [Fact]
         public void RetrievingNotesFromANonExistingGitObjectYieldsNoResult()

LibGit2Sharp.Tests/NoteFixture.cs

@@ -13,7 +13,7 @@ public class TagFixture : BaseFixture
         private readonly string[] expectedTags = new[] { "e90810b", "lw", "point_to_blob", "tag_without_tagger", "test", };
 
         private static readonly Signature signatureTim = new Signature("Tim Clem", "timothy.clem@gmail.com", TruncateSubSeconds(DateTimeOffset.UtcNow));
-        private static readonly Signature signatureNtk = new Signature("nulltoken", "emeric.fermas@gmail.com", Epoch.ToDateTimeOffset(1300557894, 60));
+        private static readonly Signature signatureNtk = new Signature("nulltoken", "emeric.fermas@gmail.com", DateTimeOffset.FromUnixTimeSeconds(1300557894).ToOffset(TimeSpan.FromMinutes(60)));
         private const string tagTestSha = "b25fa35b38051e4ae45d4222e795f9df2e43f1d1";
         private const string commitE90810BSha = "e90810b8df3e80c413d903f631643c716887138d";
         private const string tagE90810BSha = "7b4384978d2493e851f9cca7858815fac9b10980";

LibGit2Sharp.Tests/TagFixture.cs

@@ -51,8 +51,8 @@ static BaseFixture()
 
         protected static DateTimeOffset TruncateSubSeconds(DateTimeOffset dto)
         {
-            int seconds = dto.ToSecondsSinceEpoch();
-            return Epoch.ToDateTimeOffset(seconds, (int)dto.Offset.TotalMinutes);
+            var seconds = dto.ToUnixTimeSeconds();
+            return DateTimeOffset.FromUnixTimeSeconds(seconds).ToOffset(dto.Offset);
         }
 
         private static void SetUpTestEnvironment()

LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

@@ -2793,7 +2793,7 @@ public static unsafe SignatureHandle git_signature_new(string name, string email
         {
             git_signature* ptr;
 
-            int res = NativeMethods.git_signature_new(out ptr, name, email, when.ToSecondsSinceEpoch(),
+            int res = NativeMethods.git_signature_new(out ptr, name, email, when.ToUnixTimeSeconds(),
                                                       (int)when.Offset.TotalMinutes);
             Ensure.ZeroResult(res);
 

LibGit2Sharp/Core/Epoch.cs

@@ -332,7 +332,7 @@ public UsTarHeader(
 
                 this.mode = Convert.ToString(mode, 8).PadLeft(7, '0');
                 this.size = size;
-                unixTime = Convert.ToString(lastModificationTime.ToSecondsSinceEpoch(), 8).PadLeft(11, '0');
+                unixTime = Convert.ToString(lastModificationTime.ToUnixTimeSeconds(), 8).PadLeft(11, '0');
                 this.userId = userId.PadLeft(7, '0');
                 this.groupId = userId.PadLeft(7, '0');
                 this.userName = userName;

LibGit2Sharp/Core/Proxy.cs

@@ -21,7 +21,7 @@ internal unsafe Signature(git_signature* sig)
         {
             name = LaxUtf8Marshaler.FromNative(sig->name);
             email = LaxUtf8Marshaler.FromNative(sig->email);
-            when = Epoch.ToDateTimeOffset(sig->when.time, sig->when.offset);
+            when = DateTimeOffset.FromUnixTimeSeconds(sig->when.time).ToOffset(TimeSpan.FromMinutes(sig->when.offset));
         }
 
         /// <summary>