Skip to content

Commit ab2a9bf

Browse files
joostasjoostas
committed
Upgrade from project.json to csproj
1 parent 42951b6 commit ab2a9bf

File tree

9 files changed

+78
-112
lines changed

9 files changed

+78
-112
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: '{build}'
22
skip_tags: true
3-
image: Visual Studio 2015
3+
image: Visual Studio 2019
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null

‎global.json‎

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

‎serilog-formatting-compact.sln‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26114.2
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
77
EndProject
@@ -10,37 +10,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
1010
appveyor.yml = appveyor.yml
1111
Build.ps1 = Build.ps1
1212
CHANGES.md = CHANGES.md
13-
global.json = global.json
1413
README.md = README.md
1514
assets\Serilog.snk = assets\Serilog.snk
1615
EndProjectSection
1716
EndProject
1817
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{67B1C971-75EE-4ABE-B184-66AAC8D9D572}"
1918
EndProject
20-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Formatting.Compact", "src\Serilog.Formatting.Compact\Serilog.Formatting.Compact.xproj", "{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}"
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Formatting.Compact", "src\Serilog.Formatting.Compact\Serilog.Formatting.Compact.csproj", "{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3}"
2120
EndProject
22-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Formatting.Compact.Tests", "test\Serilog.Formatting.Compact.Tests\Serilog.Formatting.Compact.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Formatting.Compact.Tests", "test\Serilog.Formatting.Compact.Tests\Serilog.Formatting.Compact.Tests.csproj", "{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD}"
2322
EndProject
2423
Global
2524
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2625
Debug|Any CPU = Debug|Any CPU
2726
Release|Any CPU = Release|Any CPU
2827
EndGlobalSection
2928
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30-
{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{D8A74F4C-981B-41F1-B807-FE08DFCC06D4}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD}.Release|Any CPU.Build.0 = Release|Any CPU
3837
EndGlobalSection
3938
GlobalSection(SolutionProperties) = preSolution
4039
HideSolutionNode = FALSE
4140
EndGlobalSection
4241
GlobalSection(NestedProjects) = preSolution
43-
{D8A74F4C-981B-41F1-B807-FE08DFCC06D4} = {037440DE-440B-4129-9F7A-09B42D00397E}
44-
{3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {67B1C971-75EE-4ABE-B184-66AAC8D9D572}
42+
{E0BB862A-8B2C-46B5-9C90-B2F94C32EAB3} = {037440DE-440B-4129-9F7A-09B42D00397E}
43+
{BAEECC42-EC0C-4955-8AA1-BD3F4F0F4AAD} = {67B1C971-75EE-4ABE-B184-66AAC8D9D572}
4544
EndGlobalSection
4645
EndGlobal

‎src/Serilog.Formatting.Compact/Serilog.Formatting.Compact.csproj‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>A simple, compact JSON-based event format for Serilog.</Description>
5+
<VersionPrefix>1.0.1</VersionPrefix>
6+
<Authors>Serilog Contributors</Authors>
7+
<TargetFrameworks>net452;netstandard1.1;netstandard2.0</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Serilog.Formatting.Compact</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>Serilog.Formatting.Compact</PackageId>
15+
<PackageTags>serilog;json</PackageTags>
16+
<PackageIconUrl>http://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
17+
<PackageProjectUrl>https://github.com/serilog/serilog-formatting-compact</PackageProjectUrl>
18+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
19+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
20+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
21+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Serilog" Version="2.8.0" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
29+
<Reference Include="System" />
30+
<Reference Include="Microsoft.CSharp" />
31+
</ItemGroup>
32+
33+
</Project>

‎src/Serilog.Formatting.Compact/Serilog.Formatting.Compact.xproj‎

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

‎src/Serilog.Formatting.Compact/project.json‎

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

‎test/Serilog.Formatting.Compact.Tests/Serilog.Formatting.Compact.Tests.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
5+
<AssemblyName>Serilog.Formatting.Compact.Tests</AssemblyName>
6+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
7+
<SignAssembly>true</SignAssembly>
8+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
9+
<IsPackable>false</IsPackable>
10+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
16+
<PackageReference Include="xunit" Version="2.4.1" />
17+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
18+
<PackageReference Include="BenchmarkDotNet" Version="0.9.7-beta" />
19+
</ItemGroup>
20+
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
22+
<Reference Include="System" />
23+
<Reference Include="Microsoft.CSharp" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<ProjectReference Include="..\..\src\Serilog.Formatting.Compact\Serilog.Formatting.Compact.csproj" />
28+
</ItemGroup>
29+
30+
</Project>

‎test/Serilog.Formatting.Compact.Tests/Serilog.Formatting.Compact.Tests.xproj‎

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

‎test/Serilog.Formatting.Compact.Tests/project.json‎

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

0 commit comments

Comments
 (0)