diff --git a/CertificateInstaller/CertificateInstaller.csproj b/CertificateInstaller/CertificateInstaller.csproj index 2cad5e4..861a9a8 100644 --- a/CertificateInstaller/CertificateInstaller.csproj +++ b/CertificateInstaller/CertificateInstaller.csproj @@ -7,7 +7,7 @@ CertificateInstaller true ..\JexusManager\JexusManager.snk - net7.0-windows + net8.0-windows app.manifest @@ -24,9 +24,9 @@ - + - + diff --git a/JexusManager.Features.Access/JexusManager.Features.Access.csproj b/JexusManager.Features.Access/JexusManager.Features.Access.csproj index 7b8df2f..25cfde2 100644 --- a/JexusManager.Features.Access/JexusManager.Features.Access.csproj +++ b/JexusManager.Features.Access/JexusManager.Features.Access.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Asp/JexusManager.Features.Asp.csproj b/JexusManager.Features.Asp/JexusManager.Features.Asp.csproj index 86615f8..5c0d51e 100644 --- a/JexusManager.Features.Asp/JexusManager.Features.Asp.csproj +++ b/JexusManager.Features.Asp/JexusManager.Features.Asp.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Authentication/JexusManager.Features.Authentication.csproj b/JexusManager.Features.Authentication/JexusManager.Features.Authentication.csproj index a93a899..256e5ea 100644 --- a/JexusManager.Features.Authentication/JexusManager.Features.Authentication.csproj +++ b/JexusManager.Features.Authentication/JexusManager.Features.Authentication.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Authorization/JexusManager.Features.Authorization.csproj b/JexusManager.Features.Authorization/JexusManager.Features.Authorization.csproj index b6d89df..ae09136 100644 --- a/JexusManager.Features.Authorization/JexusManager.Features.Authorization.csproj +++ b/JexusManager.Features.Authorization/JexusManager.Features.Authorization.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Caching/JexusManager.Features.Caching.csproj b/JexusManager.Features.Caching/JexusManager.Features.Caching.csproj index 9e54acf..9d70119 100644 --- a/JexusManager.Features.Caching/JexusManager.Features.Caching.csproj +++ b/JexusManager.Features.Caching/JexusManager.Features.Caching.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Certificates/JexusManager.Features.Certificates.csproj b/JexusManager.Features.Certificates/JexusManager.Features.Certificates.csproj index 50863c7..4c18d2e 100644 --- a/JexusManager.Features.Certificates/JexusManager.Features.Certificates.csproj +++ b/JexusManager.Features.Certificates/JexusManager.Features.Certificates.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Cgi/JexusManager.Features.Cgi.csproj b/JexusManager.Features.Cgi/JexusManager.Features.Cgi.csproj index 55b796a..81248d2 100644 --- a/JexusManager.Features.Cgi/JexusManager.Features.Cgi.csproj +++ b/JexusManager.Features.Cgi/JexusManager.Features.Cgi.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Compression/JexusManager.Features.Compression.csproj b/JexusManager.Features.Compression/JexusManager.Features.Compression.csproj index d37e9c5..f167840 100644 --- a/JexusManager.Features.Compression/JexusManager.Features.Compression.csproj +++ b/JexusManager.Features.Compression/JexusManager.Features.Compression.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.DefaultDocument/JexusManager.Features.DefaultDocument.csproj b/JexusManager.Features.DefaultDocument/JexusManager.Features.DefaultDocument.csproj index 40f0fde..8fc459f 100644 --- a/JexusManager.Features.DefaultDocument/JexusManager.Features.DefaultDocument.csproj +++ b/JexusManager.Features.DefaultDocument/JexusManager.Features.DefaultDocument.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.DirectoryBrowse/JexusManager.Features.DirectoryBrowse.csproj b/JexusManager.Features.DirectoryBrowse/JexusManager.Features.DirectoryBrowse.csproj index a1520cc..1196d2d 100644 --- a/JexusManager.Features.DirectoryBrowse/JexusManager.Features.DirectoryBrowse.csproj +++ b/JexusManager.Features.DirectoryBrowse/JexusManager.Features.DirectoryBrowse.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.FastCgi/JexusManager.Features.FastCgi.csproj b/JexusManager.Features.FastCgi/JexusManager.Features.FastCgi.csproj index a0cae47..dcb96ec 100644 --- a/JexusManager.Features.FastCgi/JexusManager.Features.FastCgi.csproj +++ b/JexusManager.Features.FastCgi/JexusManager.Features.FastCgi.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Handlers/JexusManager.Features.Handlers.csproj b/JexusManager.Features.Handlers/JexusManager.Features.Handlers.csproj index 312ca17..d92726b 100644 --- a/JexusManager.Features.Handlers/JexusManager.Features.Handlers.csproj +++ b/JexusManager.Features.Handlers/JexusManager.Features.Handlers.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.HttpApi/JexusManager.Features.HttpApi.csproj b/JexusManager.Features.HttpApi/JexusManager.Features.HttpApi.csproj index c71ba54..5e23f6e 100644 --- a/JexusManager.Features.HttpApi/JexusManager.Features.HttpApi.csproj +++ b/JexusManager.Features.HttpApi/JexusManager.Features.HttpApi.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.HttpErrors/JexusManager.Features.HttpErrors.csproj b/JexusManager.Features.HttpErrors/JexusManager.Features.HttpErrors.csproj index 129b0e2..1aff462 100644 --- a/JexusManager.Features.HttpErrors/JexusManager.Features.HttpErrors.csproj +++ b/JexusManager.Features.HttpErrors/JexusManager.Features.HttpErrors.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.HttpRedirect/JexusManager.Features.HttpRedirect.csproj b/JexusManager.Features.HttpRedirect/JexusManager.Features.HttpRedirect.csproj index 04ffdf4..6f144ee 100644 --- a/JexusManager.Features.HttpRedirect/JexusManager.Features.HttpRedirect.csproj +++ b/JexusManager.Features.HttpRedirect/JexusManager.Features.HttpRedirect.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.IpSecurity/JexusManager.Features.IpSecurity.csproj b/JexusManager.Features.IpSecurity/JexusManager.Features.IpSecurity.csproj index 461977e..f69b0b9 100644 --- a/JexusManager.Features.IpSecurity/JexusManager.Features.IpSecurity.csproj +++ b/JexusManager.Features.IpSecurity/JexusManager.Features.IpSecurity.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.IsapiCgiRestriction/JexusManager.Features.IsapiCgiRestriction.csproj b/JexusManager.Features.IsapiCgiRestriction/JexusManager.Features.IsapiCgiRestriction.csproj index 13e3c33..2464d1d 100644 --- a/JexusManager.Features.IsapiCgiRestriction/JexusManager.Features.IsapiCgiRestriction.csproj +++ b/JexusManager.Features.IsapiCgiRestriction/JexusManager.Features.IsapiCgiRestriction.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.IsapiFilters/JexusManager.Features.IsapiFilters.csproj b/JexusManager.Features.IsapiFilters/JexusManager.Features.IsapiFilters.csproj index 81c398a..816aa59 100644 --- a/JexusManager.Features.IsapiFilters/JexusManager.Features.IsapiFilters.csproj +++ b/JexusManager.Features.IsapiFilters/JexusManager.Features.IsapiFilters.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Jexus/JexusManager.Features.Jexus.csproj b/JexusManager.Features.Jexus/JexusManager.Features.Jexus.csproj index 2208724..fbe11ad 100644 --- a/JexusManager.Features.Jexus/JexusManager.Features.Jexus.csproj +++ b/JexusManager.Features.Jexus/JexusManager.Features.Jexus.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Logging/JexusManager.Features.Logging.csproj b/JexusManager.Features.Logging/JexusManager.Features.Logging.csproj index 45330e4..47c502f 100644 --- a/JexusManager.Features.Logging/JexusManager.Features.Logging.csproj +++ b/JexusManager.Features.Logging/JexusManager.Features.Logging.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.MimeMap/JexusManager.Features.MimeMap.csproj b/JexusManager.Features.MimeMap/JexusManager.Features.MimeMap.csproj index 2ae7678..201aaf3 100644 --- a/JexusManager.Features.MimeMap/JexusManager.Features.MimeMap.csproj +++ b/JexusManager.Features.MimeMap/JexusManager.Features.MimeMap.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Modules/JexusManager.Features.Modules.csproj b/JexusManager.Features.Modules/JexusManager.Features.Modules.csproj index 0462ea1..286da88 100644 --- a/JexusManager.Features.Modules/JexusManager.Features.Modules.csproj +++ b/JexusManager.Features.Modules/JexusManager.Features.Modules.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.RequestFiltering/JexusManager.Features.RequestFiltering.csproj b/JexusManager.Features.RequestFiltering/JexusManager.Features.RequestFiltering.csproj index d6e7b63..cfb525a 100644 --- a/JexusManager.Features.RequestFiltering/JexusManager.Features.RequestFiltering.csproj +++ b/JexusManager.Features.RequestFiltering/JexusManager.Features.RequestFiltering.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.ResponseHeaders/JexusManager.Features.ResponseHeaders.csproj b/JexusManager.Features.ResponseHeaders/JexusManager.Features.ResponseHeaders.csproj index 3378680..3d9060f 100644 --- a/JexusManager.Features.ResponseHeaders/JexusManager.Features.ResponseHeaders.csproj +++ b/JexusManager.Features.ResponseHeaders/JexusManager.Features.ResponseHeaders.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.Rewrite/JexusManager.Features.Rewrite.csproj b/JexusManager.Features.Rewrite/JexusManager.Features.Rewrite.csproj index 4a56d83..fe6e973 100644 --- a/JexusManager.Features.Rewrite/JexusManager.Features.Rewrite.csproj +++ b/JexusManager.Features.Rewrite/JexusManager.Features.Rewrite.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Features.TraceFailedRequests/JexusManager.Features.TraceFailedRequests.csproj b/JexusManager.Features.TraceFailedRequests/JexusManager.Features.TraceFailedRequests.csproj index c4040e2..ce6e0e8 100644 --- a/JexusManager.Features.TraceFailedRequests/JexusManager.Features.TraceFailedRequests.csproj +++ b/JexusManager.Features.TraceFailedRequests/JexusManager.Features.TraceFailedRequests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/JexusManager.Shared/JexusManager.Shared.csproj b/JexusManager.Shared/JexusManager.Shared.csproj index 9bcff37..4b77022 100644 --- a/JexusManager.Shared/JexusManager.Shared.csproj +++ b/JexusManager.Shared/JexusManager.Shared.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true @@ -10,7 +10,7 @@ - + diff --git a/JexusManager/JexusManager.csproj b/JexusManager/JexusManager.csproj index d8253b2..5cdbfa3 100644 --- a/JexusManager/JexusManager.csproj +++ b/JexusManager/JexusManager.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true @@ -44,15 +44,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Microsoft.Web.Administration/CertificateInstallerLocator.cs b/Microsoft.Web.Administration/CertificateInstallerLocator.cs index 901964f..d1aa334 100644 --- a/Microsoft.Web.Administration/CertificateInstallerLocator.cs +++ b/Microsoft.Web.Administration/CertificateInstallerLocator.cs @@ -23,13 +23,13 @@ private static string FindMainHelper(string executable) return defaultPath; } - var debugBuild = Path.Combine(Environment.CurrentDirectory, $@"..\..\..\..\CertificateInstaller\bin\Debug\net7.0-windows\{executable}"); + var debugBuild = Path.Combine(Environment.CurrentDirectory, $@"..\..\..\..\CertificateInstaller\bin\Debug\net8.0-windows\{executable}"); if (File.Exists(debugBuild)) { return debugBuild; } - var releaseBuild = Path.Combine(Environment.CurrentDirectory, $@"..\..\..\..\CertificateInstaller\bin\Release\net7.0-windows\{executable}"); + var releaseBuild = Path.Combine(Environment.CurrentDirectory, $@"..\..\..\..\CertificateInstaller\bin\Release\net8.0-windows\{executable}"); if (File.Exists(releaseBuild)) { return releaseBuild; diff --git a/Microsoft.Web.Administration/Microsoft.Web.Administration.csproj b/Microsoft.Web.Administration/Microsoft.Web.Administration.csproj index 142875d..30e5a46 100644 --- a/Microsoft.Web.Administration/Microsoft.Web.Administration.csproj +++ b/Microsoft.Web.Administration/Microsoft.Web.Administration.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true @@ -15,8 +15,6 @@ all - - diff --git a/Microsoft.Web.Administration/NativeMethods.json b/Microsoft.Web.Administration/NativeMethods.json index 0f1582b..2dc1665 100644 --- a/Microsoft.Web.Administration/NativeMethods.json +++ b/Microsoft.Web.Administration/NativeMethods.json @@ -1,4 +1,4 @@ { "$schema": "https://aka.ms/CsWin32.schema.json", - "emitSingleFile": false + "emitSingleFile": true } diff --git a/Microsoft.Web.Administration/NativeMethods.txt b/Microsoft.Web.Administration/NativeMethods.txt index 962b195..6a414e8 100644 --- a/Microsoft.Web.Administration/NativeMethods.txt +++ b/Microsoft.Web.Administration/NativeMethods.txt @@ -9,3 +9,25 @@ CreatePersistentTcpPortReservation DeletePersistentTcpPortReservation WIN32_ERROR AF_INET +HttpInitialize +HttpSetServiceConfiguration +HttpDeleteServiceConfiguration +HttpTerminate +HttpQueryServiceConfiguration +HTTP_SERVICE_CONFIG_ID +HTTP_SERVICE_CONFIG_SSL_SET +HTTP_SERVICE_CONFIG_SSL_KEY +HTTP_SERVICE_CONFIG_SSL_SNI_SET +HTTP_SERVICE_CONFIG_SSL_SNI_KEY +HTTP_SERVICE_CONFIG_SSL_PARAM +HTTPAPI_VERSION +HTTP_SERVICE_CONFIG_SSL_QUERY +HTTP_SERVICE_CONFIG_SSL_SNI_QUERY +HTTP_SERVICE_CONFIG_QUERY_TYPE +HTTP_SERVICE_CONFIG_URLACL_QUERY +HTTP_SERVICE_CONFIG_URLACL_KEY +HTTP_SERVICE_CONFIG_URLACL_SET +HTTP_SERVICE_CONFIG_URLACL_PARAM +HTTP_INITIALIZE_CONFIG +HTTP_SERVICE_CONFIG_SSL_FLAG_NEGOTIATE_CLIENT_CERT +HTTP_SERVICE_CONFIG_SSL_FLAG_NO_RAW_FILTER diff --git a/Microsoft.Web.Administration/WebConfigurationManager.cs b/Microsoft.Web.Administration/WebConfigurationManager.cs index 895bf2b..712a809 100644 --- a/Microsoft.Web.Administration/WebConfigurationManager.cs +++ b/Microsoft.Web.Administration/WebConfigurationManager.cs @@ -14,7 +14,7 @@ public static ConfigurationSection GetSection(string sectionPath) return null; } -#if !NET7_0 +#if !NET8_0 public static ConfigurationSection GetSection(HttpContext context, string sectionPath) { return null; @@ -24,7 +24,7 @@ public static ConfigurationSection GetSection(string siteName, string virtualPat { return null; } -#if !NET7_0 +#if !NET8_0 public static ConfigurationSection GetSection(HttpContext context, string sectionPath, Type sectionType) { return null; diff --git a/Microsoft.Web.Management/Microsoft.Web.Management.csproj b/Microsoft.Web.Management/Microsoft.Web.Management.csproj index b2955dc..c26c316 100644 --- a/Microsoft.Web.Management/Microsoft.Web.Management.csproj +++ b/Microsoft.Web.Management/Microsoft.Web.Management.csproj @@ -1,14 +1,14 @@  - net7.0-windows + net8.0-windows true false {17E994B0-5A31-4F79-9796-83A45E87853D} Properties Microsoft.Web.Management Microsoft.Web.Management - net7.0-windows + net8.0-windows @@ -16,7 +16,7 @@ - + diff --git a/Microsoft.Web.Management/Server/PropertyBag.cs b/Microsoft.Web.Management/Server/PropertyBag.cs index d406f49..9799319 100644 --- a/Microsoft.Web.Management/Server/PropertyBag.cs +++ b/Microsoft.Web.Management/Server/PropertyBag.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Specialized; -#if !NET7_0 +#if !NET8_0 using System.Web.UI; #endif @@ -71,7 +71,7 @@ public static PropertyBag CreatePropertyBagFromState(string state) public static PropertyBag CreatePropertyBagFromState(string state, bool readOnly) { -#if !NET7_0 +#if !NET8_0 var formatter = new ObjectStateFormatter(); var bag = (PropertyBag)formatter.Deserialize(state); if (readOnly) @@ -86,7 +86,7 @@ public static PropertyBag CreatePropertyBagFromState(string state, bool readOnly public string GetState() { -#if !NET7_0 +#if !NET8_0 var formatter = new ObjectStateFormatter(); return formatter.Serialize(this); #endif diff --git a/Microsoft.Web.Management/Server/WebManagementServiceHandler.cs b/Microsoft.Web.Management/Server/WebManagementServiceHandler.cs index 733e548..0d78b66 100644 --- a/Microsoft.Web.Management/Server/WebManagementServiceHandler.cs +++ b/Microsoft.Web.Management/Server/WebManagementServiceHandler.cs @@ -7,7 +7,7 @@ namespace Microsoft.Web.Management.Server { -#if !NET7_0 +#if !NET8_0 public sealed class WebManagementServiceHandler : IHttpHandler { bool IHttpHandler.IsReusable diff --git a/Tests.IIS/Tests.IIS.csproj b/Tests.IIS/Tests.IIS.csproj index de9ce2e..c7df7b5 100644 --- a/Tests.IIS/Tests.IIS.csproj +++ b/Tests.IIS/Tests.IIS.csproj @@ -161,7 +161,7 @@ - 17.9.0-preview-23503-02 + 17.9.0 0.3.49-beta @@ -172,10 +172,10 @@ 6.0.0 - 2.6.0 + 2.7.0 - 2.5.3 + 2.5.7 runtime; build; native; contentfiles; analyzers all @@ -195,4 +195,4 @@ --> - + \ No newline at end of file diff --git a/Tests.JexusManager/Tests.JexusManager.csproj b/Tests.JexusManager/Tests.JexusManager.csproj index f9356e6..484a81c 100644 --- a/Tests.JexusManager/Tests.JexusManager.csproj +++ b/Tests.JexusManager/Tests.JexusManager.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index ce63f54..609d0a5 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true false true @@ -15,10 +15,10 @@ - + - - + + all runtime; build; native; contentfiles; analyzers