Add HostingEnvironment.ApplicationPhysicalPath/ApplicationVirtualPath (#491)

Author: twsouthwick

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/HostingRuntimeExtensions.cs

@@ -35,8 +35,8 @@ public static void AddHostingRuntime(this IServiceCollection services)
                 {
                     var config = NativeMethods.HttpGetApplicationProperties();
 
-                    options.AppDomainAppVirtualPath = config.pwzVirtualApplicationPath;
-                    options.AppDomainAppPath = config.pwzFullApplicationPath;
+                    options.ApplicationPhysicalPath = config.pwzFullApplicationPath;
+                    options.ApplicationVirtualPath = config.pwzVirtualApplicationPath;
                 }
             })
 
@@ -47,11 +47,17 @@ public static void AddHostingRuntime(this IServiceCollection services)
             {
                 if (server.Features.Get<IIISEnvironmentFeature>() is { } feature)
                 {
-                    options.AppDomainAppPath = feature.ApplicationPhysicalPath;
-                    options.AppDomainAppVirtualPath = feature.ApplicationVirtualPath;
+                    options.ApplicationPhysicalPath = feature.ApplicationPhysicalPath;
+                    options.ApplicationVirtualPath = feature.ApplicationVirtualPath;
                     options.ApplicationID = feature.ApplicationId;
                     options.SiteName = feature.SiteName;
                 }
+            })
+            .Configure(options =>
+            {
+                // On ASP.NET Core this should be the same. We're doing it here rather than a PostConfigure because someone may want to set it up differently
+                options.AppDomainAppPath = options.ApplicationPhysicalPath;
+                options.AppDomainAppVirtualPath = options.ApplicationVirtualPath;
             });
     }
 

src/Microsoft.AspNetCore.SystemWebAdapters/Generated/Ref.Standard.cs

@@ -877,6 +877,9 @@ namespace System.Web.Hosting
     public static partial class HostingEnvironment
     {
         public static string ApplicationID { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
+        public static string ApplicationPhysicalPath { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
+        public static string ApplicationVirtualPath { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
+        public static System.Web.Caching.Cache Cache { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public static bool IsHosted { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public static string SiteName { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public static System.Web.Hosting.VirtualPathProvider VirtualPathProvider { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }

src/Microsoft.AspNetCore.SystemWebAdapters/Hosting/HostingEnvironment.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Web.Caching;
+
 namespace System.Web.Hosting;
 
 public static class HostingEnvironment
@@ -9,6 +11,10 @@ public static class HostingEnvironment
 
     public static bool IsHosted => HostingEnvironmentAccessor.TryGet(out var current) && current.Options.IsHosted;
 
+    public static string ApplicationPhysicalPath => HostingEnvironmentAccessor.Current.Options.ApplicationPhysicalPath;
+
+    public static string ApplicationVirtualPath => HostingEnvironmentAccessor.Current.Options.ApplicationVirtualPath;
+
     public static string SiteName => HostingEnvironmentAccessor.Current.Options.SiteName;
 
     public static VirtualPathProvider? VirtualPathProvider => HostingEnvironmentAccessor.Current.Options.VirtualPathProvider;
@@ -19,4 +25,6 @@ public static void RegisterVirtualPathProvider(VirtualPathProvider provider)
 
         HostingEnvironmentAccessor.Current.Options.VirtualPathProvider = provider;
     }
+
+    public static Cache Cache => HttpRuntime.Cache;
 }

src/Microsoft.AspNetCore.SystemWebAdapters/Security/MachineKey.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.DataProtection;
-using System.Web.Hosting;
 
 namespace System.Web.Security;
 
@@ -19,7 +18,7 @@ private static IDataProtector GetProtector(string[] purposes)
 
         VerifyPurposes(purposes);
 
-        return HostingEnvironmentAccessor.Current.Services.GetDataProtector(MachineKeyPurpose, purposes);
+        return HttpRuntime.WebObjectActivator.GetDataProtector(MachineKeyPurpose, purposes);
     }
 
     public static byte[] Protect(byte[] userData, params string[] purposes)

src/Microsoft.AspNetCore.SystemWebAdapters/SystemWebAdaptersOptions.cs

@@ -4,6 +4,7 @@
 #if NETCOREAPP
 
 using System;
+using System.Web;
 using System.Web.Hosting;
 
 namespace Microsoft.AspNetCore.SystemWebAdapters;
@@ -12,14 +13,39 @@ public class SystemWebAdaptersOptions
 {
     private VirtualPathProvider? _virtualPathProvider;
 
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HostingEnvironment.ApplicationID"/>
+    /// </summary>
     public string ApplicationID { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HostingEnvironment.IsHosted"/>
+    /// </summary>
     public bool IsHosted { get; set; }
 
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HostingEnvironment.SiteName"/>
+    /// </summary>
     public string SiteName { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HttpRuntime.AppDomainAppVirtualPath"/>. Generally should be the same as <see cref="ApplicationVirtualPath"/> since ASP.NET Core does not have the concept of AppDomains.
+    /// </summary>
     public string AppDomainAppVirtualPath { get; set; } = "/";
 
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HostingEnvironment.ApplicationVirtualPath"/>.
+    /// </summary>
+    public string ApplicationVirtualPath { get; set; } = "/";
+
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HostingEnvironment.ApplicationPhysicalPath"/>.
+    /// </summary>
+    public string ApplicationPhysicalPath { get; set; } = AppContext.BaseDirectory;
+
+    /// <summary>
+    /// Gets or sets the value used by <see cref="HttpRuntime.AppDomainAppPath"/>. Generally should be the same as <see cref="ApplicationPhysicalPath"/> since ASP.NET Core does not have the concept of AppDomains.
+    /// </summary>
     public string AppDomainAppPath { get; set; } = AppContext.BaseDirectory;
 
     /// <summary>

src/Microsoft.AspNetCore.SystemWebAdapters/VirtualPathUtility.cs

@@ -3,7 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
-using System.Web.Hosting;
 
 namespace System.Web;
 
@@ -12,7 +11,7 @@ namespace System.Web;
 /// </summary>
 public static class VirtualPathUtility
 {
-    private static VirtualPathUtilityImpl Impl => HostingEnvironmentAccessor.Current.Services.GetRequiredService<VirtualPathUtilityImpl>();
+    private static VirtualPathUtilityImpl Impl => HttpRuntime.WebObjectActivator.GetRequiredService<VirtualPathUtilityImpl>();
 
     /// <summary>Appends the literal slash mark (/) to the end of the virtual path, if one does not already exist.</summary>
     /// <returns>The modified virtual path.</returns>

test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/HttpRuntimeIntegrationTests.cs

@@ -55,7 +55,9 @@ public async Task ConfigureRuntimeViaConfig()
         // Assert
         Assert.Equal(IIS_SITE_NAME, options.SiteName);
         Assert.Equal(IIS_APPLICATION_VIRTUAL_PATH, options.AppDomainAppVirtualPath);
+        Assert.Equal(IIS_APPLICATION_VIRTUAL_PATH, options.ApplicationVirtualPath);
         Assert.Equal(IIS_PHYSICAL_PATH, options.AppDomainAppPath);
+        Assert.Equal(IIS_PHYSICAL_PATH, options.ApplicationPhysicalPath);
         Assert.Equal(IIS_APPLICATION_ID, options.ApplicationID);
         Assert.True(options.IsHosted);
     }
@@ -85,7 +87,9 @@ public async Task ConfigureRuntimeViaFeature()
         // Assert
         Assert.Equal(IIS_SITE_NAME, options.SiteName);
         Assert.Equal(IIS_APPLICATION_VIRTUAL_PATH, options.AppDomainAppVirtualPath);
+        Assert.Equal(IIS_APPLICATION_VIRTUAL_PATH, options.ApplicationVirtualPath);
         Assert.Equal(IIS_PHYSICAL_PATH, options.AppDomainAppPath);
+        Assert.Equal(IIS_PHYSICAL_PATH, options.ApplicationPhysicalPath);
         Assert.Equal(IIS_APPLICATION_ID, options.ApplicationID);
         Assert.True(options.IsHosted);
     }