Skip to content

Commit 90393cd

Browse files
nblumhardtnblumhardt
authored
Merge pull request #75 from serilog/dotnet-cli-1.0.3
Upgrade to dotnet CLI 1.0.3
2 parents e7d116f + 5a79c7e commit 90393cd

15 files changed

+168
-247
lines changed

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ image: Visual Studio 2015
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null
7-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
88
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.3'
1010
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1111
build_script:
1212
- ps: ./Build.ps1

‎global.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
2-
"projects": [ "src", "test" ],
32
"sdk": {
4-
"version": "1.0.0-preview2-003121"
3+
"version": "1.0.3"
54
}
6-
}
5+
}

‎samples/Sample/Sample.csproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
5+
<AssemblyName>Sample</AssemblyName>
6+
<OutputType>Exe</OutputType>
7+
<PackageId>Sample</PackageId>
8+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
24+
<Reference Include="System" />
25+
<Reference Include="Microsoft.CSharp" />
26+
</ItemGroup>
27+
28+
</Project>

‎samples/Sample/Sample.xproj

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

‎samples/Sample/project.json

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

‎samples/WebSample/WebSample.csproj

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<PreserveCompilationContext>true</PreserveCompilationContext>
6+
<AssemblyName>WebSample</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>WebSample</PackageId>
9+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
14+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
15+
</None>
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
25+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
26+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
27+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
30+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
33+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
34+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
35+
<PackageReference Include="Serilog.Settings.Configuration" Version="2.3.1" />
36+
<PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
37+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
38+
<PackageReference Include="Serilog.Sinks.Seq" Version="3.2.0" />
39+
</ItemGroup>
40+
41+
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
42+
<Exec Command="bower install" />
43+
<Exec Command="dotnet bundle" />
44+
</Target>
45+
46+
<ItemGroup>
47+
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
48+
</ItemGroup>
49+
50+
</Project>

‎samples/WebSample/WebSample.xproj

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

‎samples/WebSample/project.json

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

‎serilog-extensions-logging.sln

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
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", "{A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Extensions.Logging", "src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.xproj", "{903CD13A-D54B-4CEC-A55F-E22AE3D93B3B}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{903CD13A-D54B-4CEC-A55F-E22AE3D93B3B}"
99
EndProject
10-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Extensions.Logging.Tests", "test\Serilog.Extensions.Logging.Tests\Serilog.Extensions.Logging.Tests.xproj", "{37EADF84-5E41-4224-A194-1E3299DCD0B8}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging.Tests", "test\Serilog.Extensions.Logging.Tests\Serilog.Extensions.Logging.Tests.csproj", "{37EADF84-5E41-4224-A194-1E3299DCD0B8}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1}"
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F2407211-6043-439C-8E06-3641634332E7}"
1515
EndProject
16-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample", "samples\Sample\Sample.xproj", "{65357FBC-9BC4-466D-B621-1C3A19BC2A78}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "samples\Sample\Sample.csproj", "{65357FBC-9BC4-466D-B621-1C3A19BC2A78}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{9C21B9DF-AEDD-4AA6-BEA4-912DEF3E5B8E}"
1919
ProjectSection(SolutionItems) = preProject
2020
appveyor.yml = appveyor.yml
2121
Build.ps1 = Build.ps1
22-
global.json = global.json
2322
README.md = README.md
2423
assets\Serilog.snk = assets\Serilog.snk
2524
EndProjectSection
2625
EndProject
27-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebSample", "samples\WebSample\WebSample.xproj", "{486DF7EB-128D-4C79-8B97-9CEFEADDB948}"
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSample", "samples\WebSample\WebSample.csproj", "{486DF7EB-128D-4C79-8B97-9CEFEADDB948}"
2827
EndProject
2928
Global
3029
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Serilog provider for Microsoft.Extensions.Logging</Description>
5+
<VersionPrefix>1.4.1</VersionPrefix>
6+
<Authors>Microsoft;Serilog Contributors</Authors>
7+
<TargetFrameworks>net45;net46;netstandard1.3</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Serilog.Extensions.Logging</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>Serilog.Extensions.Logging</PackageId>
15+
<PackageTags>serilog;Microsoft.Extensions.Logging</PackageTags>
16+
<PackageIconUrl>http://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
17+
<PackageProjectUrl>https://github.com/serilog/serilog-extensions-logging</PackageProjectUrl>
18+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
19+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
20+
<!-- Don't reference the full NETStandard.Library -->
21+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
26+
<PackageReference Include="Serilog" Version="2.3.0" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
30+
<Reference Include="System.Runtime" />
31+
<Reference Include="System" />
32+
<Reference Include="Microsoft.CSharp" />
33+
</ItemGroup>
34+
35+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
36+
<Reference Include="System.Runtime" />
37+
<Reference Include="System" />
38+
<Reference Include="Microsoft.CSharp" />
39+
</ItemGroup>
40+
41+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
42+
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
43+
</PropertyGroup>
44+
45+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
46+
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
47+
</PropertyGroup>
48+
49+
</Project>

0 commit comments

Comments
 (0)