Skip to content

Commit 941fc3f

Browse files
AdamWhiteHatAdamWhiteHat
committed
Upgrade all projects to .NET 7.0
1 parent c3c4619 commit 941fc3f

File tree

14 files changed

+94
-545
lines changed

14 files changed

+94
-545
lines changed

‎WELSConsole/App.config‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
5-
</startup>
63
<appSettings>
74

85
<add key="Path.Input" value="C:\Temp\wEventLogSearch\InputEventFiles.evtx"/>
@@ -18,4 +15,4 @@
1815
<add key="Bool.GroupIntoOneColumn" value="False"/>
1916

2017
</appSettings>
21-
</configuration>
18+
</configuration>

‎WELSConsole/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎WELSConsole/WELSConsole.csproj‎

Lines changed: 28 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{34E0BBCE-CC08-40DF-A0DB-544F54C5130C}</ProjectGuid>
84
<OutputType>Exe</OutputType>
9-
<RootNamespace>WELSConsole</RootNamespace>
10-
<AssemblyName>WELSConsole</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Configuration" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Xml" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="Configuration.cs" />
48-
<Compile Include="ConfigurationReader.cs" />
49-
<Compile Include="Program.cs" />
50-
<Compile Include="Properties\AssemblyInfo.cs" />
51-
</ItemGroup>
52-
<ItemGroup>
53-
<None Include="App.config" />
54-
</ItemGroup>
55-
<ItemGroup>
56-
<ProjectReference Include="..\WELSCore\WELSCore.csproj">
57-
<Project>{bae13494-bf39-4533-b20a-5036d34eb131}</Project>
58-
<Name>WELSCore</Name>
59-
</ProjectReference>
60-
</ItemGroup>
61-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
62-
</Project>
9+
10+
<PropertyGroup>
11+
<Title>WindowsEventLogSearchConsole</Title>
12+
<Product>WindowsEventLogSearchConsole</Product>
13+
<AssemblyName>WindowsEventLogSearchConsole</AssemblyName>
14+
15+
<Authors>Ryan B and Adam White</Authors>
16+
<Copyright>Copyright © Ryan B and Adam White 2023</Copyright>
17+
18+
<Version>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</Version>
19+
<AssemblyVersion>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</AssemblyVersion>
20+
<FileVersion>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</FileVersion>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\WELSCore\WELSCore.csproj" />
29+
</ItemGroup>
30+
31+
</Project>

‎WELSCore/EventLogHelper.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using System.Diagnostics.Eventing.Reader;
7+
using System.Diagnostics;
78
using System.IO;
89
using System.Threading;
910
using System.Runtime.Serialization.Formatters.Binary;

‎WELSCore/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎WELSCore/WELSCore.csproj‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{BAE13494-BF39-4533-B20A-5036D34EB131}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>WELSCore</RootNamespace>
11-
<AssemblyName>WELSCore</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
157
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="System" />
35-
<Reference Include="System.Core" />
36-
<Reference Include="System.Xml.Linq" />
37-
<Reference Include="System.Data.DataSetExtensions" />
38-
<Reference Include="Microsoft.CSharp" />
39-
<Reference Include="System.Data" />
40-
<Reference Include="System.Net.Http" />
41-
<Reference Include="System.Xml" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="EventLogHelper.cs" />
45-
<Compile Include="Properties\AssemblyInfo.cs" />
46-
<Compile Include="SearchCore.cs" />
47-
<Compile Include="SearchParameters.cs" />
48-
</ItemGroup>
49-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
50-
</Project>
8+
9+
<PropertyGroup>
10+
<Title>WindowsEventLogSearchCore</Title>
11+
<Product>WindowsEventLogSearchCore</Product>
12+
<AssemblyName>WindowsEventLogSearchCore</AssemblyName>
13+
14+
<Authors>Ryan B and Adam White</Authors>
15+
<Copyright>Copyright © Ryan B and Adam White 2023</Copyright>
16+
17+
<Version>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</Version>
18+
<AssemblyVersion>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</AssemblyVersion>
19+
<FileVersion>$([System.DateTime]::Now.ToString("yyyy."$([System.DateTime]::Now.DayOfYear)".HHmm"))</FileVersion>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0" />
24+
</ItemGroup>
25+
26+
</Project>

‎WELSearchGUI/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎WELSearchGUI/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎WELSearchGUI/Properties/Resources.Designer.cs‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)