Skip to content

Commit 8941cda

Browse files
authored
Merge pull request #46 from SimonCropp/shareCommonSettings
Share common settings
2 parents d84bbc3 + db4037e commit 8941cda

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

Directory.Build.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<Nullable>enable</Nullable>
5+
<LangVersion>latest</LangVersion>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
8+
<SignAssembly>true</SignAssembly>
9+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
10+
</PropertyGroup>
11+
</Project>

serilog-expressions.sln

Lines changed: 6 additions & 2 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 15
4-
VisualStudioVersion = 15.0.26430.15
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31410.223
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{91E482DE-E1E7-4CE1-9511-C0AF07F3648A}"
77
EndProject
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{24B112
1111
.gitignore = .gitignore
1212
appveyor.yml = appveyor.yml
1313
Build.ps1 = Build.ps1
14+
Directory.Build.props = Directory.Build.props
1415
LICENSE = LICENSE
1516
README.md = README.md
1617
RunPerfTests.ps1 = RunPerfTests.ps1
@@ -60,4 +61,7 @@ Global
6061
{3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {B03B3086-D197-4B32-9AE2-8536C345EA2D}
6162
{D7A37F73-BBA3-4DAE-9648-1A753A86F968} = {B03B3086-D197-4B32-9AE2-8536C345EA2D}
6263
EndGlobalSection
64+
GlobalSection(ExtensibilityGlobals) = postSolution
65+
SolutionGuid = {EB6672D6-318E-493E-8B60-77F5A7A90E66}
66+
EndGlobalSection
6367
EndGlobal

src/Serilog.Expressions/Serilog.Expressions.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,21 @@
66
<VersionPrefix>3.1.1</VersionPrefix>
77
<Authors>Serilog Contributors</Authors>
88
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
9-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
109
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1110
<RootNamespace>Serilog</RootNamespace>
12-
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
13-
<SignAssembly>true</SignAssembly>
14-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1511
<PackageTags>serilog</PackageTags>
1612
<PackageProjectUrl>https://github.com/serilog/serilog-expressions</PackageProjectUrl>
1713
<PackageIcon>icon.png</PackageIcon>
1814
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1915
<RepositoryUrl>https://github.com/serilog/serilog-expressions</RepositoryUrl>
2016
<RepositoryType>git</RepositoryType>
21-
<LangVersion>latest</LangVersion>
22-
<Nullable>enable</Nullable>
2317
</PropertyGroup>
2418

2519
<ItemGroup>
2620
<PackageReference Include="Serilog" Version="2.10.0" />
2721
<PackageReference Include="Nullable" Version="1.3.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
2822
</ItemGroup>
29-
23+
3024
<ItemGroup>
3125
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
3226
</ItemGroup>

test/Serilog.Expressions.PerformanceTests/Serilog.Expressions.PerformanceTests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
6-
<SignAssembly>true</SignAssembly>
7-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
85
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
9-
<Nullable>enable</Nullable>
106
</PropertyGroup>
117

128
<ItemGroup>

test/Serilog.Expressions.Tests/Serilog.Expressions.Tests.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net5.0</TargetFramework>
4-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5-
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
6-
<SignAssembly>true</SignAssembly>
7-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
84
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
9-
<Nullable>enable</Nullable>
105
</PropertyGroup>
116
<ItemGroup>
127
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />

0 commit comments

Comments
 (0)