@@ -283,91 +283,91 @@ public void UpdateAssemblyInfoWithFilename()
283283 {
284284 using var repo = new EmptyRepositoryFixture ( ) ;
285285
286- var assemblyFile = PathHelper . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
286+ var assemblyFile = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
287287 using var file = this . fileSystem . File . Create ( assemblyFile ) ;
288288
289289 var arguments = this . argumentParser . ParseArguments ( $ "-targetpath { repo . RepositoryPath } -updateAssemblyInfo CommonAssemblyInfo.cs") ;
290290 arguments . UpdateAssemblyInfo . ShouldBe ( true ) ;
291291 arguments . UpdateAssemblyInfoFileName . Count . ShouldBe ( 1 ) ;
292- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
292+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
293293 }
294294
295295 [ Test ]
296296 public void UpdateAssemblyInfoWithMultipleFilenames ( )
297297 {
298298 using var repo = new EmptyRepositoryFixture ( ) ;
299299
300- var assemblyFile1 = PathHelper . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
300+ var assemblyFile1 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
301301 using var file = this . fileSystem . File . Create ( assemblyFile1 ) ;
302302
303- var assemblyFile2 = PathHelper . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.cs" ) ;
303+ var assemblyFile2 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.cs" ) ;
304304 using var file2 = this . fileSystem . File . Create ( assemblyFile2 ) ;
305305
306306 var arguments = this . argumentParser . ParseArguments ( $ "-targetpath { repo . RepositoryPath } -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs") ;
307307 arguments . UpdateAssemblyInfo . ShouldBe ( true ) ;
308308 arguments . UpdateAssemblyInfoFileName . Count . ShouldBe ( 2 ) ;
309- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
310- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.cs" ) ) ;
309+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
310+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.cs" ) ) ;
311311 }
312312
313313 [ Test ]
314314 public void UpdateProjectFilesWithMultipleFilenames ( )
315315 {
316316 using var repo = new EmptyRepositoryFixture ( ) ;
317317
318- var assemblyFile1 = PathHelper . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.csproj" ) ;
318+ var assemblyFile1 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.csproj" ) ;
319319 using var file = this . fileSystem . File . Create ( assemblyFile1 ) ;
320320
321- var assemblyFile2 = PathHelper . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.csproj" ) ;
321+ var assemblyFile2 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.csproj" ) ;
322322 using var file2 = this . fileSystem . File . Create ( assemblyFile2 ) ;
323323
324324 var arguments = this . argumentParser . ParseArguments ( $ "-targetpath { repo . RepositoryPath } -updateProjectFiles CommonAssemblyInfo.csproj VersionAssemblyInfo.csproj") ;
325325 arguments . UpdateProjectFiles . ShouldBe ( true ) ;
326326 arguments . UpdateAssemblyInfoFileName . Count . ShouldBe ( 2 ) ;
327- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.csproj" ) ) ;
328- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.csproj" ) ) ;
327+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.csproj" ) ) ;
328+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.csproj" ) ) ;
329329 }
330330
331331 [ Test ]
332332 public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing ( )
333333 {
334334 using var repo = new EmptyRepositoryFixture ( ) ;
335335
336- var assemblyFile1 = PathHelper . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
336+ var assemblyFile1 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
337337 using var file = this . fileSystem . File . Create ( assemblyFile1 ) ;
338338
339- var assemblyFile2 = PathHelper . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.cs" ) ;
339+ var assemblyFile2 = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "VersionAssemblyInfo.cs" ) ;
340340 using var file2 = this . fileSystem . File . Create ( assemblyFile2 ) ;
341341
342- var subdir = PathHelper . Combine ( repo . RepositoryPath , "subdir" ) ;
342+ var subdir = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "subdir" ) ;
343343
344344 this . fileSystem . Directory . CreateDirectory ( subdir ) ;
345- var assemblyFile3 = PathHelper . Combine ( subdir , "LocalAssemblyInfo.cs" ) ;
345+ var assemblyFile3 = FileSystemHelper . Path . Combine ( subdir , "LocalAssemblyInfo.cs" ) ;
346346 using var file3 = this . fileSystem . File . Create ( assemblyFile3 ) ;
347347
348348 var arguments = this . argumentParser . ParseArguments ( $ "-targetpath { repo . RepositoryPath } -updateAssemblyInfo **/*AssemblyInfo.cs") ;
349349 arguments . UpdateAssemblyInfo . ShouldBe ( true ) ;
350350 arguments . UpdateAssemblyInfoFileName . Count . ShouldBe ( 3 ) ;
351- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
352- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.cs" ) ) ;
353- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "LocalAssemblyInfo.cs" ) ) ;
351+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
352+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "VersionAssemblyInfo.cs" ) ) ;
353+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "LocalAssemblyInfo.cs" ) ) ;
354354 }
355355
356356 [ Test ]
357357 public void UpdateAssemblyInfoWithRelativeFilename ( )
358358 {
359359 using var repo = new EmptyRepositoryFixture ( ) ;
360360
361- var assemblyFile = PathHelper . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
361+ var assemblyFile = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "CommonAssemblyInfo.cs" ) ;
362362 using var file = this . fileSystem . File . Create ( assemblyFile ) ;
363363
364- var targetPath = PathHelper . Combine ( repo . RepositoryPath , "subdir1" , "subdir2" ) ;
364+ var targetPath = FileSystemHelper . Path . Combine ( repo . RepositoryPath , "subdir1" , "subdir2" ) ;
365365 this . fileSystem . Directory . CreateDirectory ( targetPath ) ;
366366
367367 var arguments = this . argumentParser . ParseArguments ( $ "-targetpath { targetPath } -updateAssemblyInfo ..\\ ..\\ CommonAssemblyInfo.cs") ;
368368 arguments . UpdateAssemblyInfo . ShouldBe ( true ) ;
369369 arguments . UpdateAssemblyInfoFileName . Count . ShouldBe ( 1 ) ;
370- arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => PathHelper . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
370+ arguments . UpdateAssemblyInfoFileName . ShouldContain ( x => FileSystemHelper . Path . GetFileName ( x ) . Equals ( "CommonAssemblyInfo.cs" ) ) ;
371371 }
372372
373373 [ Test ]
@@ -765,7 +765,7 @@ public void ThrowIfConfigurationFileDoesNotExist(string configFile) =>
765765 [ Test ]
766766 public void EnsureConfigurationFileIsSet ( )
767767 {
768- var configFile = PathHelper . GetTempPath ( ) + Guid . NewGuid ( ) + ".yaml" ;
768+ var configFile = FileSystemHelper . Path . GetTempPath ( ) + Guid . NewGuid ( ) + ".yaml" ;
769769 this . fileSystem . File . WriteAllText ( configFile , "next-version: 1.0.0" ) ;
770770 var arguments = this . argumentParser . ParseArguments ( $ "-config { configFile } ") ;
771771 arguments . ConfigurationFile . ShouldBe ( configFile ) ;
0 commit comments