Skip to content

Commit

Permalink
Upgraded runtime to .NET 7.
Browse files Browse the repository at this point in the history
  • Loading branch information
lextm committed Dec 10, 2022
1 parent 8c21df2 commit 427c384
Show file tree
Hide file tree
Showing 37 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion CertificateInstaller/CertificateInstaller.csproj
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>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

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

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Web.Administration/CertificateInstallerLocator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ public static string FileName
return defaultPath;
}

var debugBuild = Path.Combine(Environment.CurrentDirectory, @"..\..\..\..\CertificateInstaller\bin\Debug\net6.0-windows\certificateinstaller.exe");
var debugBuild = Path.Combine(Environment.CurrentDirectory, @"..\..\..\..\CertificateInstaller\bin\Debug\net7.0-windows\certificateinstaller.exe");
if (File.Exists(debugBuild))
{
return debugBuild;
}

var releaseBuild = Path.Combine(Environment.CurrentDirectory, @"..\..\..\..\CertificateInstaller\bin\Release\net6.0-windows\certificateinstaller.exe");
var releaseBuild = Path.Combine(Environment.CurrentDirectory, @"..\..\..\..\CertificateInstaller\bin\Release\net7.0-windows\certificateinstaller.exe");
if (File.Exists(releaseBuild))
{
return releaseBuild;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Jexus.snk</AssemblyOriginatorKeyFile>
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Web.Administration/WebConfigurationManager.cs
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 !NET6_0
#if !NET7_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 !NET6_0
#if !NET7_0
public static ConfigurationSection GetSection(HttpContext context, string sectionPath, Type sectionType)
{
return null;
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Web.Management/Microsoft.Web.Management.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<ProjectGuid>{17E994B0-5A31-4F79-9796-83A45E87853D}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Web.Management</RootNamespace>
<AssemblyName>Microsoft.Web.Management</AssemblyName>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Web.Management/Server/PropertyBag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.Collections;
using System.Collections.Specialized;
#if !NET6_0
#if !NET7_0
using System.Web.UI;
#endif

Expand Down Expand Up @@ -71,7 +71,7 @@ public static PropertyBag CreatePropertyBagFromState(string state)

public static PropertyBag CreatePropertyBagFromState(string state, bool readOnly)
{
#if !NET6_0
#if !NET7_0
var formatter = new ObjectStateFormatter();
var bag = (PropertyBag)formatter.Deserialize(state);
if (readOnly)
Expand All @@ -86,7 +86,7 @@ public static PropertyBag CreatePropertyBagFromState(string state, bool readOnly

public string GetState()
{
#if !NET6_0
#if !NET7_0
var formatter = new ObjectStateFormatter();
return formatter.Serialize(this);
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Microsoft.Web.Management.Server
{
#if !NET6_0
#if !NET7_0
public sealed class WebManagementServiceHandler : IHttpHandler
{
bool IHttpHandler.IsReusable
Expand Down
2 changes: 1 addition & 1 deletion Tests.JexusManager/Tests.JexusManager.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>JexusManager.snk</AssemblyOriginatorKeyFile>
Expand Down

0 comments on commit 427c384

Please sign in to comment.