From 9d47497e4edaed8c0f4040de32077af7f50979f0 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 22 Aug 2017 10:01:06 +0100 Subject: [PATCH] [Xamarin.Android.Build.Tasks] Make use we use UTC Dates for ResolveLibraryProjectImports.cs We were not using UTC for allot of the date time comparisons in the `ResolveLibraryProjectImports.cs` task. We really should be since it means we should not hit any issues with LocalTimes. --- .../Tasks/ResolveLibraryProjectImports.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs index 1c772e44057..4db1c534234 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs @@ -186,7 +186,7 @@ void Extract ( // Skip already-extracted resources. var stamp = new FileInfo (Path.Combine (outdir.FullName, assemblyIdentName + ".stamp")); - if (stamp.Exists && stamp.LastWriteTime > new FileInfo (assemblyPath).LastWriteTime) { + if (stamp.Exists && stamp.LastWriteTimeUtc > new FileInfo (assemblyPath).LastWriteTimeUtc) { Log.LogDebugMessage ("Skipped resource lookup for {0}: extracted files are up to date", assemblyPath); #if SEPARATE_CRUNCH // FIXME: review these binResDir/binAssemblyDir thing and enable this. Eclipse does this. @@ -211,7 +211,7 @@ void Extract ( Directory.CreateDirectory (importsDir); var assembly = res.GetAssembly (assemblyPath); - var assemblyLastWrite = new FileInfo (assemblyPath).LastWriteTime; + var assemblyLastWrite = new FileInfo (assemblyPath).LastWriteTimeUtc; bool updated = false; foreach (var mod in assembly.Modules) { @@ -223,7 +223,7 @@ void Extract ( if (!Directory.Exists (outDirForDll)) Directory.CreateDirectory (outDirForDll); var finfo = new FileInfo (Path.Combine (outDirForDll, envtxt.Name)); - if (!finfo.Exists || finfo.LastWriteTime > assemblyLastWrite) { + if (!finfo.Exists || finfo.LastWriteTimeUtc > assemblyLastWrite) { using (var fs = finfo.Create ()) { var data = envtxt.GetResourceData (); fs.Write (data, 0, data.Length); @@ -240,7 +240,7 @@ void Extract ( foreach (var resjar in resjars) { var outjarFile = Path.Combine (importsDir, resjar.Name); var fi = new FileInfo (outjarFile); - if (!fi.Exists || fi.LastWriteTime > assemblyLastWrite) { + if (!fi.Exists || fi.LastWriteTimeUtc > assemblyLastWrite) { var data = resjar.GetResourceData (); using (var outfs = File.Create (outjarFile)) outfs.Write (data, 0, data.Length);