Handle locked files during archival of old versions too

Author: levitation

AsyncToSyncCodeRoundtripSynchroniserMonitorNet.csproj

@@ -23,7 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>SEC0122;S125;S1125;S1135;S1199;S2589;S3881;S3358;S4136;CA1034;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;MS003;IDE0018;AD0001;SEC0112</NoWarn>
+    <NoWarn>SEC0122;S125;S1125;S1135;S1199;S2589;S3881;S3358;S4136;S4457;CA1034;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;MS003;IDE0018;AD0001;SEC0112</NoWarn>
     <WarningsAsErrors>NU1605</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,7 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>SEC0122;S125;S1125;S1135;S1199;S2589;S3881;S3358;S4136;CA1034;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;MS003;IDE0018;AD0001;SEC0112</NoWarn>
+    <NoWarn>SEC0122;S125;S1125;S1135;S1199;S2589;S3881;S3358;S4136;S4457;CA1034;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;MS003;IDE0018;AD0001;SEC0112</NoWarn>
     <WarningsAsErrors>NU1605</WarningsAsErrors>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>

Program.cs

@@ -392,13 +392,36 @@ public static async Task DeleteFile(string fullName, Context context)
         {
             try
             {
-                if (File.Exists(fullName + "~"))
+                while (true)
+                {
+                    context.Token.ThrowIfCancellationRequested();
+
+                    try
+                    {
+                        if (File.Exists(fullName + "~"))
+                        {
 #pragma warning disable SEC0116 //Warning	SEC0116	Unvalidated file paths are passed to a file delete API, which can allow unauthorized file system operations (e.g. read, write, delete) to be performed on unintended server files.
-                    File.Delete(fullName + "~");
+                            File.Delete(fullName + "~");
 #pragma warning restore SEC0116
+                        }
 
-                if (File.Exists(fullName))
-                    File.Move(fullName, fullName + "~");
+                        if (File.Exists(fullName))
+                        {
+                            File.Move(fullName, fullName + "~");
+                        }
+
+                        return;
+                    }
+                    catch (IOException)
+                    {
+                        //retry after delay
+#if !NOASYNC
+                        await Task.Delay(1000, context.Token);     //TODO: config file?
+#else
+                        context.Token.WaitHandle.WaitOne(1000);
+#endif
+                    }
+                }
             }
             catch (Exception ex)
             {