Skip to content

Commit 288fb9d

Browse files
augustoproieteaugustoproiete
committed
Convert Serilog.Enrichers.ExcelDna project to SDK-style
1 parent 3cb336e commit 288fb9d

File tree

6 files changed

+57
-136
lines changed

6 files changed

+57
-136
lines changed

‎Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>latest</LangVersion>
4+
</PropertyGroup>
5+
</Project>

‎serilog-enrichers-exceldna.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{1FB790
1919
EndProject
2020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleAddIn", "sample\SampleAddIn\SampleAddIn.csproj", "{CEC178AB-3A3A-49B4-8064-D8523E0D3735}"
2121
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Enrichers.ExcelDna", "src\Serilog.Enrichers.ExcelDna\Serilog.Enrichers.ExcelDna.csproj", "{5F26EF43-543E-48F2-8B83-52EA92F8E73C}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Enrichers.ExcelDna", "src\Serilog.Enrichers.ExcelDna\Serilog.Enrichers.ExcelDna.csproj", "{5F26EF43-543E-48F2-8B83-52EA92F8E73C}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Serilog.Enrichers.ExcelDna/Properties/AssemblyInfo.cs

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

‎src/Serilog.Enrichers.ExcelDna/Serilog.Enrichers.ExcelDna.csproj

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
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>{5F26EF43-543E-48F2-8B83-52EA92F8E73C}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFrameworks>net45;net461;net472;net48</TargetFrameworks>
105
<RootNamespace>Serilog</RootNamespace>
6+
117
<AssemblyName>Serilog.Enrichers.ExcelDna</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
<TargetFrameworkProfile />
8+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
9+
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
10+
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
11+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
13+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
14+
<DebugType>portable</DebugType>
15+
<IncludeSymbols>true</IncludeSymbols>
16+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
17+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
18+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
19+
1620
<SignAssembly>true</SignAssembly>
17-
<AssemblyOriginatorKeyFile>..\..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
21+
<AssemblyOriginatorKeyFile>../../assets/exceldna.snk</AssemblyOriginatorKeyFile>
22+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
23+
24+
<NoWarn>$(NoWarn);NU5048</NoWarn>
25+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
26+
<TreatSpecificWarningsAsErrors />
1827
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
28+
29+
<PropertyGroup>
30+
<MinClientVersion>3.3</MinClientVersion>
31+
<PackageId>Serilog.Enrichers.ExcelDna</PackageId>
32+
<Version>0.0.1-local</Version>
33+
<Authors>C. Augusto Proiete &amp; Contributors</Authors>
34+
<Company>augustoproiete.net</Company>
35+
<Description>A Serilog Enricher with properties from Excel-DNA</Description>
36+
<Copyright>Copyright 2018-2020 C. Augusto Proiete &amp; Contributors - Provided under the Apache License, Version 2.0</Copyright>
37+
<PackageTags>serilog;enricher;exceldna;excel-dna;xll;xllpath;excel</PackageTags>
38+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
39+
<PackageIcon>images\icon.png</PackageIcon>
40+
<PackageIconUrl>https://raw.githubusercontent.com/augustoproiete/serilog-enrichers-exceldna/master/assets/serilog-enrichers-exceldna-nuget.png</PackageIconUrl>
41+
<PackageProjectUrl>https://github.com/augustoproiete/serilog-enrichers-exceldna</PackageProjectUrl>
42+
<PackageReleaseNotes>https://github.com/augustoproiete/serilog-enrichers-exceldna/releases</PackageReleaseNotes>
43+
<RepositoryType>git</RepositoryType>
44+
<RepositoryUrl>https://github.com/augustoproiete/serilog-enrichers-exceldna</RepositoryUrl>
2745
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
36-
<RegisterForComInterop>false</RegisterForComInterop>
37-
<DocumentationFile>bin\Release\Serilog.Enrichers.ExcelDna.xml</DocumentationFile>
46+
47+
<PropertyGroup>
48+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
3849
</PropertyGroup>
50+
3951
<ItemGroup>
40-
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\ExcelDna.Integration.1.1.0\lib\ExcelDna.Integration.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Serilog.2.9.0\lib\net45\Serilog.dll</HintPath>
46-
</Reference>
4752
<Reference Include="System" />
4853
<Reference Include="System.Core" />
54+
<Reference Include="Microsoft.CSharp" />
4955
</ItemGroup>
56+
5057
<ItemGroup>
51-
<Compile Include="Enrichers\ExcelDna\ExcelBitnessEnricher.cs" />
52-
<Compile Include="Enrichers\ExcelDna\ExcelVersionNameEnricher.cs" />
53-
<Compile Include="Enrichers\ExcelDna\ExcelVersionEnricher.cs" />
54-
<Compile Include="Enrichers\ExcelDna\XllPathEnricher.cs" />
55-
<Compile Include="ExcelDnaLoggerConfigurationExtensions.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
58+
<PackageReference Include="Serilog" Version="2.5.0" />
59+
<PackageReference Include="ExcelDna.Integration" Version="1.1.0" />
60+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5761
</ItemGroup>
62+
5863
<ItemGroup>
59-
<None Include="packages.config" />
60-
<None Include="Serilog.Enrichers.ExcelDna.nuspec">
61-
<SubType>Designer</SubType>
62-
</None>
64+
<None Include="..\..\assets\serilog-enrichers-exceldna-nuget.png" Pack="true" Visible="false" PackagePath="images\icon.png" />
6365
</ItemGroup>
64-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
65-
</Project>
66+
</Project>

‎src/Serilog.Enrichers.ExcelDna/Serilog.Enrichers.ExcelDna.nuspec

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

‎src/Serilog.Enrichers.ExcelDna/packages.config

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

0 commit comments

Comments
 (0)