Skip to content
This repository was archived by the owner on Oct 2, 2024. It is now read-only.

Commit 7d69bbb

Browse files
authored
Merge pull request #11 from tsimbalar/dependency-updates
Dependency updates Now referencing latest version of _SerilogWeb.Classic_ and a more recent version of Serilog , to have version matches across all the SerilogWeb packages.
2 parents 8640321 + ce86c89 commit 7d69bbb

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '{build}'
22
image: Visual Studio 2017
33
build_script:
4-
- ps: ./Build.ps1 -majorMinor "1.0" -patch "$env:APPVEYOR_BUILD_VERSION" -customLogger "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
4+
- ps: ./Build.ps1 -majorMinor "2.0" -patch "$env:APPVEYOR_BUILD_VERSION" -customLogger "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
55
artifacts:
66
- path: SerilogWeb.*.nupkg
77
deploy:

src/SerilogWeb.Classic.Mvc/SerilogWeb.Classic.Mvc.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@
4141
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Serilog.2.6.0\lib\net45\Serilog.dll</HintPath>
45-
<Private>True</Private>
44+
<HintPath>..\..\packages\Serilog.2.7.1\lib\net45\Serilog.dll</HintPath>
4645
</Reference>
47-
<Reference Include="SerilogWeb.Classic, Version=4.2.0.0, Culture=neutral, PublicKeyToken=9462ddd55fbc0e7f, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\SerilogWeb.Classic.4.2.41\lib\net45\SerilogWeb.Classic.dll</HintPath>
49-
<Private>True</Private>
46+
<Reference Include="SerilogWeb.Classic, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9462ddd55fbc0e7f, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\SerilogWeb.Classic.5.0.48\lib\net45\SerilogWeb.Classic.dll</HintPath>
5048
</Reference>
5149
<Reference Include="System" />
5250
<Reference Include="System.Core" />

src/SerilogWeb.Classic.Mvc/SerilogWeb.Classic.Mvc.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<description>Adds ASP.NET MVC enrichers to SerilogWeb.Classic</description>
88
<language>en-US</language>
99
<projectUrl>https://github.com/serilog-web/classic-mvc</projectUrl>
10-
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
10+
<license type="expression">Apache-2.0</license>
1111
<iconUrl>https://serilog-web.github.io/pages/images/serilog-web.png</iconUrl>
1212
<tags>serilog logging aspnet mvc</tags>
1313
</metadata>

src/SerilogWeb.Classic.Mvc/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
7-
<package id="Serilog" version="2.6.0" targetFramework="net45" />
8-
<package id="SerilogWeb.Classic" version="4.2.41" targetFramework="net45" />
7+
<package id="Serilog" version="2.7.1" targetFramework="net45" />
8+
<package id="SerilogWeb.Classic" version="5.0.48" targetFramework="net45" />
99
</packages>

test/SerilogWeb.Classic.Mvc.Test/SerilogWeb.Classic.Mvc.Test.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Serilog.2.6.0\lib\net45\Serilog.dll</HintPath>
65-
<Private>True</Private>
64+
<HintPath>..\..\packages\Serilog.2.7.1\lib\net45\Serilog.dll</HintPath>
6665
</Reference>
6766
<Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
6867
<HintPath>..\..\packages\Serilog.Settings.AppSettings.2.1.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
@@ -71,9 +70,8 @@
7170
<Reference Include="Serilog.Sinks.Trace, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
7271
<HintPath>..\..\packages\Serilog.Sinks.Trace.2.1.0\lib\net45\Serilog.Sinks.Trace.dll</HintPath>
7372
</Reference>
74-
<Reference Include="SerilogWeb.Classic, Version=4.2.0.0, Culture=neutral, PublicKeyToken=9462ddd55fbc0e7f, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\SerilogWeb.Classic.4.2.41\lib\net45\SerilogWeb.Classic.dll</HintPath>
76-
<Private>True</Private>
73+
<Reference Include="SerilogWeb.Classic, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9462ddd55fbc0e7f, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\SerilogWeb.Classic.5.0.48\lib\net45\SerilogWeb.Classic.dll</HintPath>
7775
</Reference>
7876
<Reference Include="System" />
7977
<Reference Include="System.Data" />

test/SerilogWeb.Classic.Mvc.Test/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1717
<package id="Respond" version="1.2.0" targetFramework="net45" />
18-
<package id="Serilog" version="2.6.0" targetFramework="net45" />
18+
<package id="Serilog" version="2.7.1" targetFramework="net45" />
1919
<package id="Serilog.Settings.AppSettings" version="2.1.2" targetFramework="net45" />
2020
<package id="Serilog.Sinks.Trace" version="2.1.0" targetFramework="net45" />
21-
<package id="SerilogWeb.Classic" version="4.2.41" targetFramework="net45" />
21+
<package id="SerilogWeb.Classic" version="5.0.48" targetFramework="net45" />
2222
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
2323
</packages>

0 commit comments

Comments
 (0)