Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

Commit dc2d734

Browse files
committed
clean obsolete .net versions
1 parent 8f0b27b commit dc2d734

File tree

6 files changed

+10
-30
lines changed

6 files changed

+10
-30
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
- name: Checkout repository
3939
uses: actions/checkout@v2
4040

41+
- name: Setup dotnet
42+
uses: actions/setup-dotnet@v2
43+
with:
44+
dotnet-version: '6.0.x'
45+
4146
# Initializes the CodeQL tools for scanning.
4247
- name: Initialize CodeQL
4348
uses: github/codeql-action/init@v1

global.json

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

src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.Elasticsearch.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<VersionSuffix>alpha</VersionSuffix>
66
<Authors>Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe, Serilog Contributors</Authors>
7-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Formatting.Elasticsearch</AssemblyName>
@@ -33,10 +33,6 @@
3333
<PackageReference Include="Serilog" Version="2.8.0" />
3434
</ItemGroup>
3535

36-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
37-
<DefineConstants>$(DefineConstants);NO_SERIALIZATION</DefineConstants>
38-
</PropertyGroup>
39-
4036
<ItemGroup>
4137
<DotNetCliToolReference Include="dotnet-version" Version="1.1.0" />
4238
</ItemGroup>

src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<VersionSuffix>alpha</VersionSuffix>
66
<Authors>Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe, Serilog Contributors</Authors>
7-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Sinks.Elasticsearch</AssemblyName>
@@ -19,7 +19,6 @@
1919
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
2020
<RepositoryUrl>https://github.com/serilog/serilog-sinks-elasticsearch</RepositoryUrl>
2121
<RepositoryType>git</RepositoryType>
22-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
2322
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
2423
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
2524
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
@@ -33,11 +32,7 @@
3332
<DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER</DefineConstants>
3433
</PropertyGroup>
3534

36-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
37-
<NoWarn>1591;1701;1702</NoWarn>
38-
<DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER;HRESULTS</DefineConstants>
39-
</PropertyGroup>
40-
35+
4136
<ItemGroup>
4237
<DotNetCliToolReference Include="dotnet-version" Version="1.1.0" />
4338

test/Serilog.Sinks.Elasticsearch.IntegrationTests/Serilog.Sinks.Elasticsearch.IntegrationTests.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>netcoreapp2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
55
<NoWarn>$(NoWarn);xUnit1013</NoWarn>
66
<DebugSymbols>True</DebugSymbols>
77
<LangVersion>latest</LangVersion>

test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
55
<AssemblyName>Serilog.Sinks.Elasticsearch.Tests</AssemblyName>
66
<PackageId>Serilog.Sinks.Elasticsearch.Tests</PackageId>
77

@@ -69,17 +69,6 @@
6969
<PackageReference Include="FluentAssertions" Version="4.19.4" />
7070
</ItemGroup>
7171

72-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
73-
<Reference Include="System.Diagnostics.Tools" />
74-
<Reference Include="System.IO.Compression.FileSystem" />
75-
<Reference Include="System.Reflection" />
76-
<Reference Include="System.Runtime" />
77-
<Reference Include="System.Linq" />
78-
<Reference Include="System.Threading.Tasks" />
79-
<Reference Include="System" />
80-
<Reference Include="Microsoft.CSharp" />
81-
</ItemGroup>
82-
8372

8473
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
8574
<PackageReference Include="Microsoft.CSharp" Version="4.6.0" />

0 commit comments

Comments
 (0)