Skip to content

Commit 33db02f

Browse files
committed
Allowed Visual Studio 2017 to upgrade xproj to csproj
Allowed Visual Studio 2017 to automatically upgrade the xproj to csproj and tinker with the solution file and global.json.
1 parent 234e788 commit 33db02f

File tree

5 files changed

+38
-54
lines changed

5 files changed

+38
-54
lines changed

global.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
{
2-
"projects": [ "src", "test" ],
3-
"sdk": {
4-
"version": "1.0.0-preview1-002702"
5-
}
6-
}
1+
{"projects":["src","test"]}

serilog-enrichers-thread.sln

Lines changed: 6 additions & 3 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.28307.329
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
77
EndProject
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
1414
assets\Serilog.snk = assets\Serilog.snk
1515
EndProjectSection
1616
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Enrichers.Thread", "src\Serilog.Enrichers.Thread\Serilog.Enrichers.Thread.xproj", "{E0BD3797-55A5-4E8C-8DE7-8487BEB75914}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Enrichers.Thread", "src\Serilog.Enrichers.Thread\Serilog.Enrichers.Thread.csproj", "{E0BD3797-55A5-4E8C-8DE7-8487BEB75914}"
1818
EndProject
1919
Global
2020
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,4 +33,7 @@ Global
3333
GlobalSection(NestedProjects) = preSolution
3434
{E0BD3797-55A5-4E8C-8DE7-8487BEB75914} = {037440DE-440B-4129-9F7A-09B42D00397E}
3535
EndGlobalSection
36+
GlobalSection(ExtensibilityGlobals) = postSolution
37+
SolutionGuid = {155C418E-39FB-4037-B825-7FEE96CEBDFB}
38+
EndGlobalSection
3639
EndGlobal
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Enrich Serilog events with properties from the current thread.</Description>
5+
<VersionPrefix>3.0.1</VersionPrefix>
6+
<Authors>Serilog Contributors</Authors>
7+
<TargetFrameworks>net45;netstandard1.0</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Serilog.Enrichers.Thread</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>Serilog.Enrichers.Thread</PackageId>
15+
<PackageTags>serilog;thread;enricher</PackageTags>
16+
<PackageIconUrl>http://serilog.net/images/serilog-enricher-nuget.png</PackageIconUrl>
17+
<PackageProjectUrl>http://serilog.net</PackageProjectUrl>
18+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
19+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Serilog" Version="2.3.0" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
27+
<Reference Include="System" />
28+
<Reference Include="Microsoft.CSharp" />
29+
</ItemGroup>
30+
31+
</Project>

src/Serilog.Enrichers.Thread/Serilog.Enrichers.Thread.xproj

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

src/Serilog.Enrichers.Thread/project.json

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

0 commit comments

Comments
 (0)