restrict C# nuget unit tests to local package feeds (#9694)

dependabot · May 17, 2024 · ac97d9a · ac97d9a
1 parent 85dcd0b
commit ac97d9a
Show file tree

Hide file tree

Showing 22 changed files with 4,332 additions and 3,205 deletions.
diff --git a/nuget/helpers/lib/NuGetUpdater/Directory.Packages.props b/nuget/helpers/lib/NuGetUpdater/Directory.Packages.props
@@ -13,6 +13,8 @@
     <PackageVersion Include="Microsoft.Build" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
 
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 
     <PackageVersion Include="NuGet.Core" Version="2.14.0-rtm-832" Aliases="CoreV2" />

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs
@@ -3,9 +3,11 @@
 using System.Text.Json;
 
 using NuGetUpdater.Core.Discover;
+using NuGetUpdater.Core.Test.Update;
 using NuGetUpdater.Core.Test.Utilities;
 
 using Xunit;
+using Xunit.Sdk;
 
 namespace NuGetUpdater.Core.Test.Discover;
 
@@ -16,10 +18,13 @@ public class DiscoveryWorkerTestBase
     protected static async Task TestDiscoveryAsync(
         string workspacePath,
         TestFile[] files,
-        ExpectedWorkspaceDiscoveryResult expectedResult)
+        ExpectedWorkspaceDiscoveryResult expectedResult,
+        MockNuGetPackage[]? packages = null)
     {
         var actualResult = await RunDiscoveryAsync(files, async directoryPath =>
         {
+            await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, directoryPath);
+
             var worker = new DiscoveryWorker(new Logger(verbose: true));
             await worker.RunAsync(directoryPath, workspacePath, DiscoveryWorker.DiscoveryResultFileName);
         });

diff --git a/.../lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.DotNetToolsJson.cs b/.../lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.DotNetToolsJson.cs
@@ -10,6 +10,7 @@ public class DotNetToolsJson : DiscoveryWorkerTestBase
         public async Task DiscoversDependencies()
         {
             await TestDiscoveryAsync(
+                packages: [],
                 workspacePath: "",
                 files: [
                     (".config/dotnet-tools.json", """
@@ -45,13 +46,15 @@ public async Task DiscoversDependencies()
                         ]
                     },
                     ExpectedProjectCount = 0,
-                });
+                }
+            );
         }
 
         [Fact]
         public async Task ReportsFailure()
         {
             await TestDiscoveryAsync(
+                packages: [],
                 workspacePath: "",
                 files: [
                     (".config/dotnet-tools.json", """
@@ -85,7 +88,8 @@ public async Task ReportsFailure()
                         ExpectedDependencyCount = 0,
                     },
                     ExpectedProjectCount = 0,
-                });
+                }
+            );
         }
     }
 }
diff --git a/...lpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.GlobalJson.cs b/...lpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.GlobalJson.cs
@@ -10,6 +10,7 @@ public class GlobalJson : DiscoveryWorkerTestBase
         public async Task DiscoversDependencies()
         {
             await TestDiscoveryAsync(
+                packages: [],
                 workspacePath: "",
                 files: [
                     ("global.json", """
@@ -35,13 +36,15 @@ public async Task DiscoversDependencies()
                         ]
                     },
                     ExpectedProjectCount = 0,
-                });
+                }
+            );
         }
 
         [Fact]
         public async Task ReportsFailure()
         {
             await TestDiscoveryAsync(
+                packages: [],
                 workspacePath: "",
                 files: [
                     ("global.json", """
@@ -65,7 +68,8 @@ public async Task ReportsFailure()
                         ExpectedDependencyCount = 0,
                     },
                     ExpectedProjectCount = 0,
-                });
+                }
+            );
         }
     }
 }
diff --git a/...s/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.PackagesConfig.cs b/...s/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.PackagesConfig.cs
@@ -1,5 +1,3 @@
-using System.Collections.Immutable;
-
 using Xunit;
 
 namespace NuGetUpdater.Core.Test.Discover;
@@ -12,20 +10,18 @@ public class PackagesConfig : DiscoveryWorkerTestBase
         public async Task DiscoversDependencies()
         {
             await TestDiscoveryAsync(
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net46"),
+                    MockNuGetPackage.CreateSimplePackage("Package.B", "2.0.0", "net46"),
+                ],
                 workspacePath: "",
                 files: [
                     ("packages.config", """
                         <?xml version="1.0" encoding="utf-8"?>
                         <packages>
-                          <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net46" />
-                          <package id="Microsoft.Net.Compilers" version="1.0.1" targetFramework="net46" developmentDependency="true" />
-                          <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-                          <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
-                          <package id="Newtonsoft.Json" version="8.0.3" allowedVersions="[8,10)" targetFramework="net46" />
-                          <package id="NuGet.Core" version="2.11.1" targetFramework="net46" />
-                          <package id="NuGet.Server" version="2.11.2" targetFramework="net46" />
-                          <package id="RouteMagic" version="1.3" targetFramework="net46" />
-                          <package id="WebActivatorEx" version="2.1.0" targetFramework="net46" />
+                          <package id="Package.A" version="1.0.0" targetFramework="net46" />
+                          <package id="Package.B" version="2.0.0" targetFramework="net46" />
                         </packages>
                         """),
                     ("myproj.csproj", """
@@ -49,19 +45,13 @@ public async Task DiscoversDependencies()
                             TargetFrameworks = ["net46"],
                             Dependencies = [
                                 new("Microsoft.NETFramework.ReferenceAssemblies", "1.0.3", DependencyType.Unknown, TargetFrameworks: ["net46"], IsTransitive: true),
-                                new("Microsoft.CodeDom.Providers.DotNetCompilerPlatform", "1.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Microsoft.Net.Compilers", "1.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Microsoft.Web.Infrastructure", "1.0.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Microsoft.Web.Xdt", "2.1.1", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Newtonsoft.Json", "8.0.3", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("NuGet.Core", "2.11.1", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("NuGet.Server", "2.11.2", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("RouteMagic", "1.3", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("WebActivatorEx", "2.1.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
+                                new("Package.A", "1.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
+                                new("Package.B", "2.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
                             ],
                         }
                     ],
-                });
+                }
+            );
         }
     }
 }