Skip to content

Commit b173202

Browse files
authored
Update .NET framework to 462 and bump STJ to 8.0.5 (#457)
1 parent 4ba40a1 commit b173202

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

Directory.Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
<LangVersion>latest</LangVersion>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19-
<DefineConstants Condition="'$(TargetFramework)'=='net461'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
19+
<DefineConstants Condition="'$(TargetFramework)'=='net462'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
2020
</PropertyGroup>
2121
<ItemGroup>
2222
<PackageReference Include="MinVer" Version="2.3.1" PrivateAssets="all" />
23-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3" PrivateAssets="all"/>
23+
<PackageReference Condition="'$(TargetFramework)'=='net462'"
24+
Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3" PrivateAssets="all"/>
2425
</ItemGroup>
2526
</Project>

src/Elastic.Apm.NLog/Elastic.Apm.NLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
44
<Title>Elastic APM NLog Layout Renderers</Title>
55
<Description>Enrich NLog log messages with APM TraceId and TransactionId.</Description>
66
<IsPackable>True</IsPackable>

src/Elastic.Apm.SerilogEnricher/Elastic.Apm.SerilogEnricher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
44
<Title>Elastic APM Serilog Enricher</Title>
55
<Description>Enrich Serilog log messages with APM TraceId and TransactionId.</Description>
66
<IsPackable>True</IsPackable>

src/Elastic.CommonSchema.Log4net/Elastic.CommonSchema.Log4net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
55
<Title>Elastic Common Schema (ECS) log4net Layout</Title>
66
<Description>log4net Layout that formats log events in accordance with Elastic Common Schema (ECS).</Description>
77
<IsPackable>True</IsPackable>

src/Elastic.CommonSchema.NLog/Elastic.CommonSchema.NLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
55
<Title>Elastic Common Schema (ECS) NLog Layout</Title>
66
<Description>NLog Layout that formats log events in accordance with Elastic Common Schema (ECS).</Description>
77
<IsPackable>True</IsPackable>

src/Elastic.CommonSchema.Serilog/Elastic.CommonSchema.Serilog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Project Sdk="Microsoft.NET.Sdk">
44
<PropertyGroup>
5-
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
66
<Title>Elastic Common Schema (ECS) Serilog Formatter</Title>
77
<Description>Serilog TextFormatter that formats log events in accordance with Elastic Common Schema (ECS).</Description>
88
<IsPackable>True</IsPackable>

src/Elastic.CommonSchema/Elastic.CommonSchema.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net6.0</TargetFrameworks>
55
<Title>Elastic Common Schema (ECS) Types</Title>
66
<Description>Maps Elastic Common Schema (ECS) to .NET types including (de)serialization using System.Text.Json</Description>
77
<LangVersion>latest</LangVersion>
@@ -14,9 +14,9 @@
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
1616
</ItemGroup>
17-
<ItemGroup Condition="$(TargetFramework) == 'net461' OR $(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'netstandard2.1'">
17+
<ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'netstandard2.1'">
1818
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
19-
<PackageReference Include="System.Text.Json" Version="6.0.1" />
19+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
2020

2121
</ItemGroup>
2222
<ItemGroup>

src/Elastic.Serilog.Enrichers.Web/Elastic.Serilog.Enrichers.Web.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-
<TargetFrameworks>net6.0;net8.0;net461</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net462</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Title>Elastic Common Schema (ECS) Serilog Enricher for Web proeprties</Title>

0 commit comments

Comments
 (0)