wip

Author: bdovaz

src/UnityNuGet.Tests/NativeTests.cs

@@ -2,11 +2,9 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
-using Moq;
 using NUnit.Framework;
 using UnityNuGet.Npm;
 
@@ -18,9 +16,6 @@ public class NativeTests
         [Test]
         public async Task TestBuild()
         {
-            Mock<IHostEnvironment> hostEnvironmentMock = new();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
             LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
@@ -29,7 +24,7 @@ public async Task TestBuild()
 
             bool errorsTriggered = false;
 
-            Registry registry = new(hostEnvironmentMock.Object, loggerFactory, Options.Create(new RegistryOptions { RegistryFilePath = "registry.json" }));
+            Registry registry = new(loggerFactory, Options.Create(new RegistryOptions { RegistryFilePath = "registry.json" }));
 
             await registry.StartAsync(CancellationToken.None);
 

src/UnityNuGet.Tests/RegistryCacheTests.cs

@@ -2,11 +2,9 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
-using Moq;
 using NuGet.Versioning;
 using NUnit.Framework;
 using UnityNuGet.Npm;
@@ -31,14 +29,11 @@ public async Task TestBuild()
         {
             bool errorsTriggered = false;
 
-            Mock<IHostEnvironment> hostEnvironmentMock = new();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
             LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
             string unityPackages = Path.Combine(Path.GetDirectoryName(typeof(RegistryCacheTests).Assembly.Location)!, "unity_packages");
-            Registry registry = new(hostEnvironmentMock.Object, loggerFactory, Options.Create(new RegistryOptions { RegistryFilePath = "registry.json" }));
+            Registry registry = new(loggerFactory, Options.Create(new RegistryOptions { RegistryFilePath = "registry.json" }));
 
             await registry.StartAsync(CancellationToken.None);
 

src/UnityNuGet.Tests/RegistryTests.cs

@@ -1,15 +1,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
-using Moq;
 using NuGet.Configuration;
 using NuGet.PackageManagement;
 using NuGet.Packaging;
@@ -31,13 +28,10 @@ public class RegistryTests
         [TestCase("Scriban")]
         public async Task Make_Sure_That_The_Registry_Is_Case_Insensitive(string packageName)
         {
-            Mock<IHostEnvironment> hostEnvironmentMock = new();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
             LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
-            Registry registry = new(hostEnvironmentMock.Object, loggerFactory, Options.Create(s_registryOptions));
+            Registry registry = new(loggerFactory, Options.Create(s_registryOptions));
 
             await registry.StartAsync(CancellationToken.None);
 
@@ -51,13 +45,10 @@ public async Task Make_Sure_That_The_Registry_Is_Case_Insensitive(string package
         [Test]
         public async Task Make_Sure_That_The_Order_In_The_Registry_Is_Respected()
         {
-            Mock<IHostEnvironment> hostEnvironmentMock = new();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
             LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
-            Registry registry = new(hostEnvironmentMock.Object, loggerFactory, Options.Create(s_registryOptions));
+            Registry registry = new(loggerFactory, Options.Create(s_registryOptions));
 
             await registry.StartAsync(CancellationToken.None);
 
@@ -70,13 +61,10 @@ public async Task Make_Sure_That_The_Order_In_The_Registry_Is_Respected()
         [Test]
         public async Task Ensure_That_Packages_Already_Included_In_Net_Standard_Are_not_Included_In_The_Registry()
         {
-            Mock<IHostEnvironment> hostEnvironmentMock = new();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
             LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
-            Registry registry = new(hostEnvironmentMock.Object, loggerFactory, Options.Create(s_registryOptions));
+            Registry registry = new(loggerFactory, Options.Create(s_registryOptions));
 
             await registry.StartAsync(CancellationToken.None);
 
@@ -138,19 +126,16 @@ public async Task CanParse_PackageWithRuntimes()
 
         static async Task<TestCaseData[]> AllRegistries()
         {
-            Mock<IHostEnvironment> hostEnvironmentMock = new ();
-            hostEnvironmentMock.Setup(h => h.EnvironmentName).Returns(Environments.Development);
-
-            LoggerFactory loggerFactory = new ();
+            LoggerFactory loggerFactory = new();
             loggerFactory.AddProvider(new FakeLoggerProvider());
 
-            Registry registry = new (hostEnvironmentMock.Object, loggerFactory, Options.Create(s_registryOptions));
+            Registry registry = new(loggerFactory, Options.Create(s_registryOptions));
 
-            NuGetConsoleTestLogger logger = new ();
+            NuGetConsoleTestLogger logger = new();
 
             await registry.StartAsync(CancellationToken.None);
 
-            SourceCacheContext cache = new ();
+            SourceCacheContext cache = new();
             SourceRepository repository = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
             PackageMetadataResource resource = await repository.GetResourceAsync<PackageMetadataResource>();
 

src/UnityNuGet.Tests/UnityNuGet.Tests.csproj

@@ -19,7 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\..\registry.json" />
+    <EmbeddedResource Include="..\..\registry.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <ProjectReference Include="..\UnityNuGet\UnityNuGet.csproj" />
   </ItemGroup>
 

src/UnityNuGet/Registry.cs

@@ -15,13 +15,11 @@ namespace UnityNuGet
     /// Loads the `registry.json` file at startup
     /// </summary>
     public sealed class Registry(
-        IHostEnvironment hostEnvironment,
         ILoggerFactory loggerFactory,
         IOptions<RegistryOptions> registryOptionsAccessor) : IHostedService, IReadOnlyCollection<KeyValuePair<string, RegistryEntry>>, IEnumerable<KeyValuePair<string, RegistryEntry>>
     {
         private IDictionary<string, RegistryEntry>? _data;
 
-        private readonly IHostEnvironment _hostEnvironment = hostEnvironment;
         private readonly ILoggerFactory _loggerFactory = loggerFactory;
         private readonly RegistryOptions _registryOptions = registryOptionsAccessor.Value;
 
@@ -43,20 +41,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             }
             else
             {
-                bool isDevelopment = _hostEnvironment.IsDevelopment();
-
-                string currentDirectory;
-
-                if (isDevelopment)
-                {
-                    currentDirectory = Path.GetDirectoryName(AppContext.BaseDirectory)!;
-                }
-                else
-                {
-                    currentDirectory = Directory.GetCurrentDirectory();
-                }
-
-                registryFilePath = Path.Combine(currentDirectory, _registryOptions.RegistryFilePath!);
+                registryFilePath = Path.Combine(Directory.GetCurrentDirectory(), _registryOptions.RegistryFilePath!);
             }
 
             ILogger logger = _loggerFactory.CreateLogger("NuGet");