Skip to content

Commit

Permalink
Upgraded to .NET 8.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lextm
lextm committed Sep 12, 2024
1 parent 7e03128 commit ca0f312
Show file tree
Hide file tree
Showing 40 changed files with 79 additions and 59 deletions.
6 changes: 3 additions & 3 deletions CertificateInstaller/CertificateInstaller.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>CertificateInstaller</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\JexusManager\JexusManager.snk</AssemblyOriginatorKeyFile>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>

Expand All @@ -24,9 +24,9 @@
</PackageReference>
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Management" Version="7.0.2" />
<PackageReference Include="System.Management" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Access/JexusManager.Features.Access.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Asp/JexusManager.Features.Asp.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Authentication/JexusManager.Features.Authentication.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Authorization/JexusManager.Features.Authorization.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Caching/JexusManager.Features.Caching.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Certificates/JexusManager.Features.Certificates.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Cgi/JexusManager.Features.Cgi.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Compression/JexusManager.Features.Compression.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.DefaultDocument/JexusManager.Features.DefaultDocument.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.DirectoryBrowse/JexusManager.Features.DirectoryBrowse.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.FastCgi/JexusManager.Features.FastCgi.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Handlers/JexusManager.Features.Handlers.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.HttpApi/JexusManager.Features.HttpApi.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.HttpErrors/JexusManager.Features.HttpErrors.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.HttpRedirect/JexusManager.Features.HttpRedirect.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.IpSecurity/JexusManager.Features.IpSecurity.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.IsapiCgiRestriction/JexusManager.Features.IsapiCgiRestriction.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.IsapiFilters/JexusManager.Features.IsapiFilters.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Jexus/JexusManager.Features.Jexus.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Logging/JexusManager.Features.Logging.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.MimeMap/JexusManager.Features.MimeMap.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Modules/JexusManager.Features.Modules.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.RequestFiltering/JexusManager.Features.RequestFiltering.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.ResponseHeaders/JexusManager.Features.ResponseHeaders.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.Rewrite/JexusManager.Features.Rewrite.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion JexusManager.Features.TraceFailedRequests/JexusManager.Features.TraceFailedRequests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down
4 changes: 2 additions & 2 deletions JexusManager.Shared/JexusManager.Shared.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand All @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.6" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.8" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="Tulpep.NotificationWindow" Version="1.1.38" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions JexusManager/JexusManager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -44,15 +44,15 @@

<ItemGroup>
<PackageReference Include="ActionListWinForms" Version="2.0.0" />
<PackageReference Include="Enums.NET" Version="4.0.1" />
<PackageReference Include="Enums.NET" Version="4.0.2" />
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ini-parser" Version="2.5.2" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="NuGet.Versioning" Version="6.7.0" />
<PackageReference Include="Octokit" Version="9.0.0" />
<PackageReference Include="NuGet.Versioning" Version="6.9.1" />
<PackageReference Include="Octokit" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Web.Administration/CertificateInstallerLocator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions Microsoft.Web.Administration/Microsoft.Web.Administration.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>false</UseWPF>
<SignAssembly>true</SignAssembly>
Expand All @@ -15,8 +15,6 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Rollbar" Version="5.2.0" />
<PackageReference Include="Vanara.PInvoke.Shell32" Version="3.4.17" />
<PackageReference Include="Vanara.PInvoke.Ws2_32" Version="3.4.17" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Web.Administration/NativeMethods.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "https://aka.ms/CsWin32.schema.json",
"emitSingleFile": false
"emitSingleFile": true
}
22 changes: 22 additions & 0 deletions Microsoft.Web.Administration/NativeMethods.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Microsoft.Web.Administration/WebConfigurationManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading

0 comments on commit ca0f312

Please sign in to comment.