fixup

Author: siegfriedpammer

ICSharpCode.Decompiler.Tests/Helpers/RoslynToolset.cs

@@ -30,6 +30,7 @@
 using NuGet.Packaging;
 using NuGet.Protocol;
 using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
 
 using NUnit.Framework;
 
@@ -57,19 +58,40 @@ protected async Task FetchPackage(string packageName, string version, string sou
 
 			ILogger logger = NullLogger.Instance;
 			CancellationToken cancellationToken = CancellationToken.None;
-			using var packageStream = File.OpenRead(Path.Combine(Roundtrip.RoundtripAssembly.TestDir, "nuget", $"{packageName}-{version}.nupkg"));
-
-			using PackageArchiveReader packageReader = new PackageArchiveReader(packageStream);
-			NuspecReader nuspecReader = await packageReader.GetNuspecReaderAsync(cancellationToken).ConfigureAwait(false);
-
-			var files = (await packageReader.GetFilesAsync(cancellationToken).ConfigureAwait(false)).ToArray();
-			files = files.Where(f => f.StartsWith(sourcePath, StringComparison.OrdinalIgnoreCase)).ToArray();
-			await packageReader.CopyFilesAsync(outputPath, files,
-				(sourceFile, targetPath, fileStream) => {
-					fileStream.CopyToFile(targetPath);
-					return targetPath;
-				},
-				logger, cancellationToken).ConfigureAwait(false);
+			string pathToPackage = Path.Combine(Roundtrip.RoundtripAssembly.TestDir, "nuget", $"{packageName}-{version}.nupkg");
+			Stream packageStream;
+			if (File.Exists(pathToPackage))
+			{
+				packageStream = File.OpenRead(pathToPackage);
+			}
+			else
+			{
+				packageStream = new MemoryStream();
+
+				await resource.CopyNupkgToStreamAsync(
+					packageName,
+					NuGetVersion.Parse(version),
+					packageStream,
+					cache,
+					logger,
+					cancellationToken).ConfigureAwait(false);
+
+				packageStream.Position = 0;
+			}
+			using (packageStream)
+			{
+				using PackageArchiveReader packageReader = new PackageArchiveReader(packageStream);
+				NuspecReader nuspecReader = await packageReader.GetNuspecReaderAsync(cancellationToken).ConfigureAwait(false);
+
+				var files = (await packageReader.GetFilesAsync(cancellationToken).ConfigureAwait(false)).ToArray();
+				files = files.Where(f => f.StartsWith(sourcePath, StringComparison.OrdinalIgnoreCase)).ToArray();
+				await packageReader.CopyFilesAsync(outputPath, files,
+					(sourceFile, targetPath, fileStream) => {
+						fileStream.CopyToFile(targetPath);
+						return targetPath;
+					},
+					logger, cancellationToken).ConfigureAwait(false);
+			}
 		}
 	}