Updated package references, version.

grhm · Jan 5, 2018 · 321b67f · 321b67f
1 parent d3d4973
commit 321b67f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 33 deletions.
diff --git a/build.fsx b/build.fsx
@@ -12,7 +12,7 @@ let packagesPath = FullName "./src/packages"
 let keyFile = FullName "./Topshelf.snk"
 
 let assemblyVersion = "4.0.0.0"
-let baseVersion = "4.0.3"
+let baseVersion = "4.1.0"
 
 let semVersion : SemVerInfo = parse baseVersion
 
@@ -32,14 +32,13 @@ let informationalVersion = (fun _ ->
 
 let nugetVersion = (fun _ ->
   let branchName = (branch ".")
-  let label = if branchName="master" then "" else "-" + (if branchName="mt3" then "beta" else branchName)
+  let label = if branchName="master" then "" else "-" + branchName)
   (Version + label)
 )
 
 let InfoVersion = informationalVersion()
 let NuGetVersion = nugetVersion()
 
-
 printfn "Using version: %s" Version
 
 Target "Clean" (fun _ ->

diff --git a/src/SampleTopshelfService/SampleTopshelfService.csproj b/src/SampleTopshelfService/SampleTopshelfService.csproj
@@ -79,8 +79,8 @@
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/SampleTopshelfService/packages.config b/src/SampleTopshelfService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net452" />
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
 </packages>
diff --git a/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj b/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj
@@ -44,9 +44,8 @@
     <DocumentationFile>bin\Release\Topshelf.Log4Net.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Topshelf.Log4Net/packages.config b/src/Topshelf.Log4Net/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net452" />
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
 </packages>
diff --git a/src/Topshelf.NLog/Topshelf.NLog.csproj b/src/Topshelf.NLog/Topshelf.NLog.csproj
@@ -44,9 +44,8 @@
     <DocumentationFile>bin\Release\Topshelf.NLog.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.10\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
+      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Topshelf.NLog/packages.config b/src/Topshelf.NLog/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.3.10" targetFramework="net452" />
+  <package id="NLog" version="4.4.12" targetFramework="net452" />
 </packages>
diff --git a/src/Topshelf.Serilog/Topshelf.Serilog.csproj b/src/Topshelf.Serilog/Topshelf.Serilog.csproj
@@ -43,13 +43,8 @@
     <DocumentationFile>bin\Release\Topshelf.Serilog.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.2.6.0\lib\net45\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Topshelf.Serilog/packages.config b/src/Topshelf.Serilog/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Serilog" version="1.5.14" targetFramework="net452" />
+  <package id="Serilog" version="2.6.0" targetFramework="net452" />
 </packages>
diff --git a/src/Topshelf.Tests/Topshelf.Tests.csproj b/src/Topshelf.Tests/Topshelf.Tests.csproj
@@ -39,9 +39,8 @@
     <DefineConstants>NET35</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Topshelf.Tests/packages.config b/src/Topshelf.Tests/packages.config
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.ConsoleRunner" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net452" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net452" />
-  <package id="NUnit.Runners" version="3.5.0" targetFramework="net452" />
+  <package id="NUnit" version="3.9.0" targetFramework="net452" />
 </packages>