Remove needless variables

Author: HashidaTKS

…Tests/UploadFileBridge/PathMacroTests.cs …wserGuard.Tests/Common/PathMacroTests.csBrowserGuard.Tests/UploadFileBridge/PathMacroTests.cs renamed to BrowserGuard.Tests/Common/PathMacroTests.cs BrowserGuard.Tests/UploadFileBridge/PathMacroTests.cs renamed to BrowserGuard.Tests/Common/PathMacroTests.cs

@@ -1,8 +1,8 @@
 using System;
 using Xunit;
-using BrowserGuard.UploadFileBridge;
+using BrowserGuard.Common;
 
-namespace BrowserGuard.Tests.UploadFileBridge
+namespace BrowserGuard.Tests.Common
 {
     public class PathMacroTests
     {
@@ -33,7 +33,7 @@ public void PutsTheMachineAndTheUserIntoThePath()
         {
             var expanded = PathMacro.Expand(@"\\server\%PCNAME%\%USERID%", Now);
 
-            Assert.Equal($@"\\server\{Environment.MachineName}\{Environment.UserName}", expanded);
+            Assert.Equal($@"\\server\{System.Environment.MachineName}\{System.Environment.UserName}", expanded);
         }
 
         [Fact]
@@ -42,7 +42,7 @@ public void ExpandsSeveralMacrosInOnePath()
             var expanded = PathMacro.Expand(@"\\server\%PCNAME%\%DATE%\%USERID%", Now);
 
             Assert.Equal(
-                $@"\\server\{Environment.MachineName}\2026-08-20\{Environment.UserName}",
+                $@"\\server\{System.Environment.MachineName}\2026-08-20\{System.Environment.UserName}",
                 expanded);
         }
 
@@ -52,7 +52,7 @@ public void ExpandsSeveralMacrosInOnePath()
         [InlineData("%PCNAME%")]
         public void DoesNotMindHowTheMacroIsSpelled(string macro)
         {
-            Assert.Equal(Environment.MachineName, PathMacro.Expand(macro, Now));
+            Assert.Equal(System.Environment.MachineName, PathMacro.Expand(macro, Now));
         }
 
         // Dropping it would quietly put every machine in the same folder, where

…owserGuard/UploadFileBridge/PathMacro.cs BrowserGuard/Common/PathMacro.csBrowserGuard/UploadFileBridge/PathMacro.cs renamed to BrowserGuard/Common/PathMacro.cs BrowserGuard/UploadFileBridge/PathMacro.cs renamed to BrowserGuard/Common/PathMacro.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
-using BrowserGuard.NetLogger;
 
-namespace BrowserGuard.UploadFileBridge
+namespace BrowserGuard.Common
 {
     // A destination folder is written with macros, so that one setting can
     // spread what it writes over a folder per machine, per user or per day
@@ -31,8 +30,8 @@ internal static string Expand(string text, DateTime now)
         private static string? Resolve(string name, DateTime now) =>
             name.ToUpperInvariant() switch
             {
-                "PCNAME" => NetLogEntry.MachineName,
-                "USERID" => NetLogEntry.UserName,
+                "PCNAME" => Environment.MachineName,
+                "USERID" => Environment.UserName,
                 "DATE" => now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
                 "YYYY" => now.ToString("yyyy", CultureInfo.InvariantCulture),
                 "MM" => now.ToString("MM", CultureInfo.InvariantCulture),

BrowserGuard/NetLogger/NetLogEntry.cs

@@ -14,9 +14,6 @@ internal static class NetLogEntry
         internal const string MachineProperty = "pcname";
         internal const string UserProperty = "userid";
 
-        internal static readonly string MachineName = Environment.MachineName;
-        internal static readonly string UserName = Environment.UserName;
-
         // The log is read back as text, so the escaping is relaxed to leave
         // Japanese page titles legible rather than as \uXXXX escapes.
         private static readonly JsonWriterOptions WriterOptions = new()
@@ -74,8 +71,8 @@ internal static string UploadFileBridgeFailed(string file, string reason, DateTi
                         }
                         property.WriteTo(writer);
                     }
-                    writer.WriteString(MachineProperty, MachineName);
-                    writer.WriteString(UserProperty, UserName);
+                    writer.WriteString(MachineProperty, Environment.MachineName);
+                    writer.WriteString(UserProperty, Environment.UserName);
                     writer.WriteEndObject();
                 }
                 line = Encoding.UTF8.GetString(buffer.ToArray());