Skip to content

Commit c8687a8

Browse files
snakefootsnakefoot
authored
Replaced net5.0-windows with net6.0-windows (#128)
1 parent c4fc693 commit c8687a8

File tree

10 files changed

+21
-25
lines changed

10 files changed

+21
-25
lines changed

‎NLog.Windows.Forms.Tests/NLog.Windows.Forms.Tests.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net452;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net461;netcoreapp3.1;net6.0-windows</TargetFrameworks>
4+
<UseWindowsForms>true</UseWindowsForms>
45
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
56
<AssemblyTitle>NLog.Windows.Forms.Tests</AssemblyTitle>
67
<Company>Microsoft</Company>
@@ -20,17 +21,13 @@
2021
<AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
2122
</PropertyGroup>
2223
<ItemGroup>
23-
<PackageReference Include="xunit" Version="2.4.2" />
24-
<PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
24+
<PackageReference Include="xunit" Version="2.4.0" />
25+
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
2526
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2627
<PrivateAssets>all</PrivateAssets>
2728
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2829
</PackageReference>
2930
</ItemGroup>
30-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452'">
31-
<Reference Include="System.Windows.Forms" />
32-
<Reference Include="System.Data.DataSetExtensions" />
33-
</ItemGroup>
3431
<ItemGroup>
3532
<None Include="NLog.snk" />
3633
</ItemGroup>

‎NLog.Windows.Forms.sln‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplicationNetFramework
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplicationCore3", "TestApplications\TestApplicationCore3\TestApplicationCore3.csproj", "{9FAC81DA-0137-47E9-957A-D8A9A5215338}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplicationNet5", "TestApplications\TestApplicationNet5\TestApplicationNet5.csproj", "{134980CC-0226-42B1-B02F-A9C81AAB0A3D}"
15-
EndProject
1614
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Applications", "Test Applications", "{6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}"
1715
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.Shared", "TestApplications\TestApplication.Shared\TestApplication.Shared.csproj", "{CA02182B-27A3-485F-969F-3D3EE7720992}"
1917
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplicationNet6", "TestApplications\TestApplicationNet6\TestApplicationNet6.csproj", "{47AB6DA7-9F2C-44B6-86A0-EA9EFCD3566C}"
2119
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E22BDDB-E0CD-4C22-AE81-0310DE7B6E9B}"
21+
ProjectSection(SolutionItems) = preProject
22+
appveyor.yml = appveyor.yml
23+
build.ps1 = build.ps1
24+
EndProjectSection
25+
EndProject
2226
Global
2327
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2428
Debug|Any CPU = Debug|Any CPU
@@ -41,10 +45,6 @@ Global
4145
{9FAC81DA-0137-47E9-957A-D8A9A5215338}.Debug|Any CPU.Build.0 = Debug|Any CPU
4246
{9FAC81DA-0137-47E9-957A-D8A9A5215338}.Release|Any CPU.ActiveCfg = Release|Any CPU
4347
{9FAC81DA-0137-47E9-957A-D8A9A5215338}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{134980CC-0226-42B1-B02F-A9C81AAB0A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{134980CC-0226-42B1-B02F-A9C81AAB0A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{134980CC-0226-42B1-B02F-A9C81AAB0A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{134980CC-0226-42B1-B02F-A9C81AAB0A3D}.Release|Any CPU.Build.0 = Release|Any CPU
4848
{CA02182B-27A3-485F-969F-3D3EE7720992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4949
{CA02182B-27A3-485F-969F-3D3EE7720992}.Debug|Any CPU.Build.0 = Debug|Any CPU
5050
{CA02182B-27A3-485F-969F-3D3EE7720992}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,7 +60,6 @@ Global
6060
GlobalSection(NestedProjects) = preSolution
6161
{03D9D89A-B972-4446-AB4A-A430851243D0} = {6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}
6262
{9FAC81DA-0137-47E9-957A-D8A9A5215338} = {6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}
63-
{134980CC-0226-42B1-B02F-A9C81AAB0A3D} = {6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}
6463
{CA02182B-27A3-485F-969F-3D3EE7720992} = {6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}
6564
{47AB6DA7-9F2C-44B6-86A0-EA9EFCD3566C} = {6AB4C95A-36D8-4F52-8F25-EF9CA98AF536}
6665
EndGlobalSection

‎NLog.Windows.Forms/NLog.Windows.Forms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net35;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net35;netcoreapp3.1;net6.0-windows</TargetFrameworks>
4+
<UseWindowsForms>true</UseWindowsForms>
45
<AssemblyTitle>NLog.Windows.Forms</AssemblyTitle>
56
<Company>NLog</Company>
67
<Product>NLog.Windows.Forms</Product>
@@ -16,7 +17,6 @@
1617
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1718
<IncludeSymbols>true</IncludeSymbols>
1819
<DebugType Condition=" '$(Configuration)' == 'Debug' ">Full</DebugType>
19-
<UseWindowsForms>true</UseWindowsForms>
2020
<SignAssembly>true</SignAssembly>
2121
<AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
2222
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

‎NLog.Windows.Forms/Targets/FormControlTarget.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public sealed class FormControlTarget : TargetWithLayout
3333
/// Initializes a new instance of the <see cref="FormControlTarget" /> class.
3434
/// </summary>
3535
/// <remarks>
36-
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message}</code>
36+
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message:withException=true}</code>
3737
/// </remarks>
3838
public FormControlTarget()
3939
{

‎NLog.Windows.Forms/Targets/MessageBoxTarget.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class MessageBoxTarget : TargetWithLayout
3838
/// Initializes a new instance of the <see cref="MessageBoxTarget" /> class.
3939
/// </summary>
4040
/// <remarks>
41-
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message}</code>
41+
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message:withException=true}</code>
4242
/// </remarks>
4343
public MessageBoxTarget()
4444
{

‎NLog.Windows.Forms/Targets/RichTextBoxTarget.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public sealed class RichTextBoxTarget : TargetWithLayout
5353
/// Initializes static members of the RichTextBoxTarget class.
5454
/// </summary>
5555
/// <remarks>
56-
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message}</code>
56+
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message:withException=true}</code>
5757
/// </remarks>
5858
static RichTextBoxTarget()
5959
{
@@ -177,7 +177,7 @@ private static IEnumerable<RichTextBoxTarget> GetRichTextBoxTargets(LoggingConfi
177177
/// Initializes a new instance of the <see cref="RichTextBoxTarget" /> class.
178178
/// </summary>
179179
/// <remarks>
180-
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message}</code>
180+
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message:withException=true}</code>
181181
/// </remarks>
182182
public RichTextBoxTarget()
183183
{

‎NLog.Windows.Forms/Targets/ToolStripItemTarget.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public sealed class ToolStripItemTarget : TargetWithLayout
3232
/// Initializes a new instance of the <see cref="ToolStripItemTarget" /> class.
3333
/// </summary>
3434
/// <remarks>
35-
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message}</code>
35+
/// The default value of the layout is: <code>${longdate}|${level:uppercase=true}|${logger}|${message:withException=true}</code>
3636
/// </remarks>
3737
public ToolStripItemTarget()
3838
{

‎TestApplications/TestApplication.Shared/TestApplication.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net462</TargetFramework>
4+
<TargetFramework>net461</TargetFramework>
55
<EnableDefaultItems>false</EnableDefaultItems>
66
</PropertyGroup>
77

‎TestApplications/TestApplicationNetFramework/TestApplicationNetFramework.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net462</TargetFramework>
4+
<TargetFramework>net461</TargetFramework>
55
<AssemblyTitle>TestApplication</AssemblyTitle>
66
<Product>TestApplication</Product>
77
<OutputPath>bin\$(Configuration)\</OutputPath>

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ build_script:
88
- ps: .\build.ps1
99
test_script:
1010
- nuget.exe install OpenCover -ExcludeVersion -DependencyVersion Ignore
11-
- OpenCover\tools\OpenCover.Console.exe -register:user -target:"%xunit20%\xunit.console.x86.exe" -targetargs:"\"c:\projects\nlog\NLog.Windows.Forms.Tests\bin\Release\net452\NLog.Windows.Forms.Tests.dll\" -appveyor -noshadow" -returntargetcode -filter:"+[NLog.Windows.Forms]* -[NLog.Windows.Forms.Tests]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:coverage.xml
11+
- OpenCover\tools\OpenCover.Console.exe -register:user -target:"%xunit20%\xunit.console.x86.exe" -targetargs:"\"c:\projects\nlog\NLog.Windows.Forms.Tests\bin\Release\net461\NLog.Windows.Forms.Tests.dll\" -appveyor -noshadow" -returntargetcode -filter:"+[NLog.Windows.Forms]* -[NLog.Windows.Forms.Tests]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -output:coverage.xml
1212
- OpenCover\tools\OpenCover.Console.exe -register:user -mergeoutput -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -f netcoreapp3.1 -c debug NLog.Windows.Forms.Tests" -filter:"+[NLog.Windows.Forms]* -[NLog.Windows.Forms.Tests]*" -output:"coverage.xml" -oldstyle -targetdir:"NLog.Windows.Forms.Tests"
13-
- OpenCover\tools\OpenCover.Console.exe -register:user -mergeoutput -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -f net5.0 -c debug NLog.Windows.Forms.Tests" -filter:"+[NLog.Windows.Forms]* -[NLog.Windows.Forms.Tests]*" -output:"coverage.xml" -oldstyle -targetdir:"NLog.Windows.Forms.Tests"
13+
- OpenCover\tools\OpenCover.Console.exe -register:user -mergeoutput -target:"C:/Program Files/dotnet/dotnet.exe" -targetargs:"test -f net6.0 -c debug NLog.Windows.Forms.Tests" -filter:"+[NLog.Windows.Forms]* -[NLog.Windows.Forms.Tests]*" -output:"coverage.xml" -oldstyle -targetdir:"NLog.Windows.Forms.Tests"
1414
- pip install codecov
1515
- codecov -f "coverage.xml"
1616

0 commit comments

Comments
 (0)