Updated Log4Net version

divverence · Jan 4, 2014 · a665558 · a665558
1 parent 2762a23
commit a665558
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 20 deletions.
diff --git a/rakefile.rb b/rakefile.rb
@@ -183,7 +183,7 @@ def copyOutputFiles(fromDir, filePattern, outDir)
   nuspec.licenseUrl = "http://www.apache.org/licenses/LICENSE-2.0"
   nuspec.requireLicenseAcceptance = "false"
   nuspec.dependency "Topshelf", NUGET_VERSION
-  nuspec.dependency "Log4Net", "2.0.2"
+  nuspec.dependency "Log4Net", "2.0.3"
   nuspec.output_file = File.join(props[:artifacts], 'Topshelf.Log4Net.nuspec')
   add_files props[:output], 'Topshelf.Log4Net.{dll,pdb,xml}', nuspec
   nuspec.file(File.join(props[:src], "Topshelf.Log4Net\\**\\*.cs").gsub("/","\\"), "src")

diff --git a/src/SampleTopshelfRehabService/SampleTopshelfRehabService.csproj b/src/SampleTopshelfRehabService/SampleTopshelfRehabService.csproj
@@ -41,11 +41,11 @@
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' != 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/SampleTopshelfRehabService/packages.config b/src/SampleTopshelfRehabService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.2" targetFramework="net40" />
+  <package id="log4net" version="2.0.3" targetFramework="net40" />
 </packages>
diff --git a/src/SampleTopshelfService/SampleTopshelfService.csproj b/src/SampleTopshelfService/SampleTopshelfService.csproj
@@ -75,11 +75,11 @@
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' != 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <Private>True</Private>
     </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.2" targetFramework="net40" />
+  <package id="log4net" version="2.0.3" targetFramework="net40" />
 </packages>
diff --git a/src/SampleTopshelfSuperviseService/SampleTopshelfSuperviseService.csproj b/src/SampleTopshelfSuperviseService/SampleTopshelfSuperviseService.csproj
@@ -41,13 +41,14 @@
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' != 'v3.5'">
       <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
     </Reference>

diff --git a/src/SampleTopshelfSuperviseService/packages.config b/src/SampleTopshelfSuperviseService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.2" targetFramework="net40" />
+  <package id="log4net" version="2.0.3" targetFramework="net40" />
 </packages>
diff --git a/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj b/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj
@@ -37,11 +37,11 @@
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net35-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' != 'v3.5'">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <Private>True</Private>
     </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.2" targetFramework="net40" />
+  <package id="log4net" version="2.0.3" targetFramework="net40" />
 </packages>