Merge pull request #165 from dsplaisted/retry-write-jenkins-build-number

AArnott · web-flow · commit 146671c65564 · 2018-01-19T11:30:25.000-08:00
Add retry logic for writing Jenkins build number FileOperationWithRetry
diff --git a/src/NerdBank.GitVersioning/CloudBuildServices/Jenkins.cs b/src/NerdBank.GitVersioning/CloudBuildServices/Jenkins.cs
@@ -58,7 +58,7 @@ private static void WriteVersionFile(string buildNumber)
 
             var versionFilePath = Path.Combine(workspacePath, "jenkins_build_number.txt");
 
-            File.WriteAllText(versionFilePath, buildNumber, UTF8NoBOM);
+            Utilities.FileOperationWithRetry(() => File.WriteAllText(versionFilePath, buildNumber, UTF8NoBOM));
         }
     }
 }
diff --git a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
@@ -12,4 +12,7 @@
     <PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
     <PackageReference Include="NuProj.Common" Version="0.11.14-beta" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
 </Project>
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj
@@ -12,4 +12,7 @@
     <ProjectReference Include="..\MSBuildExtensionTask\MSBuildExtensionTask.csproj" />
     <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
 </Project>
diff --git a/src/Shared/Utilities.cs b/src/Shared/Utilities.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Validation;
 
-namespace Nerdbank.GitVersioning.Tasks
+namespace Nerdbank.GitVersioning
 {
     internal static class Utilities
     {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private static void WriteVersionFile(string buildNumber)`
`58`	`58`
`59`	`59`	`var versionFilePath = Path.Combine(workspacePath, "jenkins_build_number.txt");`
`60`	`60`
`61`		`- File.WriteAllText(versionFilePath, buildNumber, UTF8NoBOM);`
	`61`	`+ Utilities.FileOperationWithRetry(() => File.WriteAllText(versionFilePath, buildNumber, UTF8NoBOM));`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using Validation;`
`6`	`6`
`7`		`-namespace Nerdbank.GitVersioning.Tasks`
	`7`	`+namespace Nerdbank.GitVersioning`
`8`	`8`	`{`
`9`	`9`	`internal static class Utilities`
`10`	`10`	`{`