Skip to content

Commit 9795ab4

Browse files
augustoproieteaugustoproiete
committed
Convert Serilog.Sinks.ExcelDnaLogDisplay.Tests project to SDK-style
1 parent e68495b commit 9795ab4

File tree

4 files changed

+20
-141
lines changed

4 files changed

+20
-141
lines changed

‎serilog-sinks-exceldnalogdisplay.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleAddIn", "sample\Sampl
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.ExcelDnaLogDisplay", "src\Serilog.Sinks.ExcelDnaLogDisplay\Serilog.Sinks.ExcelDnaLogDisplay.csproj", "{20E3AF43-2C31-47A6-8270-C1B8B4B6C665}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.ExcelDnaLogDisplay.Tests", "test\Serilog.Sinks.ExcelDnaLogDisplay.Tests\Serilog.Sinks.ExcelDnaLogDisplay.Tests.csproj", "{6198F301-FDDB-4ED7-8A8B-A0B8E9871737}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.ExcelDnaLogDisplay.Tests", "test\Serilog.Sinks.ExcelDnaLogDisplay.Tests\Serilog.Sinks.ExcelDnaLogDisplay.Tests.csproj", "{6198F301-FDDB-4ED7-8A8B-A0B8E9871737}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{6EDA15C1-B783-4A43-971E-3C9FAB25F5F8}"
1313
ProjectSection(SolutionItems) = preProject

‎test/Serilog.Sinks.ExcelDnaLogDisplay.Tests/Properties/AssemblyInfo.cs‎

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

‎test/Serilog.Sinks.ExcelDnaLogDisplay.Tests/Serilog.Sinks.ExcelDnaLogDisplay.Tests.csproj‎

Lines changed: 19 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,28 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
5-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
63
<PropertyGroup>
7-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9-
<ProjectGuid>{6198F301-FDDB-4ED7-8A8B-A0B8E9871737}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Serilog.Sinks.ExcelDnaLogDisplay.Tests</RootNamespace>
13-
<AssemblyName>Serilog.Sinks.ExcelDnaLogDisplay.Tests</AssemblyName>
14-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<Deterministic>true</Deterministic>
4+
<TargetFramework>net48</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
177
<SignAssembly>true</SignAssembly>
18-
<AssemblyOriginatorKeyFile>..\..\assets\exceldna.snk</AssemblyOriginatorKeyFile>
19-
<TargetFrameworkProfile />
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
8+
<AssemblyOriginatorKeyFile>../../assets/exceldna.snk</AssemblyOriginatorKeyFile>
9+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
10+
11+
<NoWarn>$(NoWarn);NU5048</NoWarn>
3712
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<TreatSpecificWarningsAsErrors />
3814
</PropertyGroup>
15+
3916
<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\net46\Serilog.dll</HintPath>
46-
</Reference>
47-
<Reference Include="System" />
48-
<Reference Include="System.Core" />
49-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll</HintPath>
51-
</Reference>
52-
<Reference Include="xunit.assert, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
54-
</Reference>
55-
<Reference Include="xunit.core, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
57-
</Reference>
58-
<Reference Include="xunit.execution.desktop, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
60-
</Reference>
61-
</ItemGroup>
62-
<ItemGroup>
63-
<Compile Include="LogDisplayConfigurationExtensionsTests.cs" />
64-
<Compile Include="LogDisplaySinkTests.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
66-
<Compile Include="Support\ReverseLogEventFormatter.cs" />
67-
<Compile Include="Support\Some.cs" />
68-
<Compile Include="Support\LogDisplayEx.cs" />
69-
<Compile Include="Support\ThrowingLogEventFormatter.cs" />
70-
</ItemGroup>
71-
<ItemGroup>
72-
<ProjectReference Include="..\..\src\Serilog.Sinks.ExcelDnaLogDisplay\Serilog.Sinks.ExcelDnaLogDisplay.csproj">
73-
<Project>{20e3af43-2c31-47a6-8270-c1b8b4b6c665}</Project>
74-
<Name>Serilog.Sinks.ExcelDnaLogDisplay</Name>
75-
</ProjectReference>
76-
</ItemGroup>
77-
<ItemGroup>
78-
<None Include="packages.config" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
18+
<PackageReference Include="xunit" Version="2.4.1" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
20+
<PackageReference Include="coverlet.collector" Version="1.3.0" />
21+
<PackageReference Include="Serilog" Version="2.9.0" />
7922
</ItemGroup>
23+
8024
<ItemGroup>
81-
<Analyzer Include="..\..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
25+
<ProjectReference Include="..\..\src\Serilog.Sinks.ExcelDnaLogDisplay\Serilog.Sinks.ExcelDnaLogDisplay.csproj" />
8226
</ItemGroup>
83-
<ItemGroup />
84-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
85-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
86-
<PropertyGroup>
87-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
88-
</PropertyGroup>
89-
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
90-
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
91-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
92-
</Target>
93-
<Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
27+
9428
</Project>

‎test/Serilog.Sinks.ExcelDnaLogDisplay.Tests/packages.config‎

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

0 commit comments

Comments
 (0)