Skip to content

Commit 73c1d1c

Browse files
GregorBiswangerGregorBiswanger
committed
Upgrade to .NET 7
1 parent c2a8c62 commit 73c1d1c

File tree

6 files changed

+1812
-24
lines changed

6 files changed

+1812
-24
lines changed

‎ElectronNET.API/Dialog.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Threading.Tasks;
8-
using System.Web;
98

109
namespace ElectronNET.API
1110
{

‎ElectronNET.API/ElectronNET.API.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
54
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
65
<PackageOutputPath>..\artifacts</PackageOutputPath>
76
<PackageId>ElectronNET.API</PackageId>
@@ -21,27 +20,27 @@ This package contains the API to access the "native" electron API.</Description>
2120
<Version>99.0.0.0</Version>
2221
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2322
</PropertyGroup>
24-
2523
<ItemGroup>
2624
<None Include="PackageIcon.png" Pack="true" PackagePath="\" />
2725
</ItemGroup>
28-
2926
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
3027
<Exec Command="$(ProjectDir)devCleanup.cmd" IgnoreExitCode="true" />
3128
</Target>
3229
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
3330
<Exec Command="$(ProjectDir)devCleanup.sh" IgnoreExitCode="true" />
3431
</Target>
3532
<ItemGroup>
36-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
37-
</ItemGroup>
33+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
34+
</ItemGroup>
3835
<ItemGroup>
3936
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
4037
<PrivateAssets>all</PrivateAssets>
4138
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4239
</PackageReference>
4340
<PackageReference Include="SocketIoClientDotNet" Version="1.0.5" />
44-
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
41+
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
42+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
43+
<PrivateAssets>all</PrivateAssets>
44+
</PackageReference>
4545
</ItemGroup>
46-
47-
</Project>
46+
</Project>

‎ElectronNET.API/GlobalUsings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Global using directives
2+
3+
global using System.Web;

‎ElectronNET.CLI/ElectronNET.CLI.csproj

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
5-
6-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
75
<AssemblyName>dotnet-electronize</AssemblyName>
86
<ToolCommandName>electronize</ToolCommandName>
9-
107
<PackageType>DotnetCliTool</PackageType>
118
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
129
<PackageOutputPath>..\artifacts</PackageOutputPath>
@@ -29,22 +26,19 @@
2926
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
3027
<PackageIcon>PackageIcon.png</PackageIcon>
3128
<PackAsTool>true</PackAsTool>
32-
<StartupObject></StartupObject>
29+
<StartupObject>
30+
</StartupObject>
3331
</PropertyGroup>
34-
3532
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
3633
<PlatformTarget>AnyCPU</PlatformTarget>
3734
</PropertyGroup>
38-
3935
<ItemGroup>
4036
<None Remove="ElectronHost\package-lock.json" />
4137
<None Remove="ElectronHost\package.json" />
4238
</ItemGroup>
43-
4439
<ItemGroup>
4540
<None Include="PackageIcon.png" Pack="true" PackagePath="\" />
4641
</ItemGroup>
47-
4842
<ItemGroup>
4943
<EmbeddedResource Include="..\ElectronNET.Host\electron.manifest.json" Link="ElectronHost\electron.manifest.json" />
5044
<EmbeddedResource Include="..\ElectronNET.Host\package.json" Link="ElectronHost\package.json" />
@@ -75,17 +69,19 @@
7569
<EmbeddedResource Include="..\ElectronNET.Host\api\powerMonitor.js" Link="ElectronHost\api\powerMonitor.js" />
7670
<EmbeddedResource Include="..\ElectronNET.Host\api\nativeTheme.js" Link="ElectronHost\api\nativeTheme.js" />
7771
</ItemGroup>
78-
7972
<ItemGroup>
8073
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
8174
<PrivateAssets>all</PrivateAssets>
8275
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
8376
</PackageReference>
77+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
78+
<PrivateAssets>all</PrivateAssets>
79+
</PackageReference>
8480
</ItemGroup>
8581
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
8682
<Exec Command="$(ProjectDir)devCleanup.cmd" IgnoreExitCode="true" />
8783
</Target>
8884
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
8985
<Exec Command="$(ProjectDir)devCleanup.sh" IgnoreExitCode="true" />
9086
</Target>
91-
</Project>
87+
</Project>

0 commit comments

Comments
 (0)