Core: Updated projects to use log2net from NuGet, removed old versions

i7MEDIA · Oct 12, 2018 · 3991854 · 3991854
1 parent 2dd670b
commit 3991854
Show file tree

Hide file tree

Showing 24 changed files with 57 additions and 58,871 deletions.
diff --git a/SuperFlexiBusiness/SuperFlexiBusiness.csproj b/SuperFlexiBusiness/SuperFlexiBusiness.csproj
@@ -82,9 +82,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -172,6 +171,9 @@
       <Name>SuperFlexiData.SQLite</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/SuperFlexiBusiness/packages.config b/SuperFlexiBusiness/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/_libs/log4net.dll b/_libs/log4net.dll
diff --git a/_libs/log4net.xml b/_libs/log4net.xml
diff --git a/_libs/log4net1-2-11/log4net.dll b/_libs/log4net1-2-11/log4net.dll
diff --git a/_libs/log4net1-2-11/log4net.xml b/_libs/log4net1-2-11/log4net.xml
diff --git a/mojoPortal.Business.WebHelpers/mojoPortal.Business.WebHelpers.csproj b/mojoPortal.Business.WebHelpers/mojoPortal.Business.WebHelpers.csproj
@@ -110,7 +110,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\_libs\GCheckout1.3.2\GCheckout.dll</HintPath>
     </Reference>
-    <Reference Include="log4net">
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />

diff --git a/mojoPortal.Business.WebHelpers/packages.config b/mojoPortal.Business.WebHelpers/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Business/mojoPortal.Business.csproj b/mojoPortal.Business/mojoPortal.Business.csproj
@@ -155,7 +155,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">

diff --git a/mojoPortal.Business/packages.config b/mojoPortal.Business/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Data.MSSQL/mojoPortal.Data.MSSQL.csproj b/mojoPortal.Data.MSSQL/mojoPortal.Data.MSSQL.csproj
@@ -64,7 +64,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -142,6 +141,9 @@
     <Compile Include="SqlHelper.cs" />
     <Compile Include="SQLParameterHelper.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/mojoPortal.Data.MSSQL/packages.config b/mojoPortal.Data.MSSQL/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Data.MySql/mojoPortal.Data.MySql.csproj b/mojoPortal.Data.MySql/mojoPortal.Data.MySql.csproj
@@ -144,7 +144,6 @@
       <HintPath>..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />

diff --git a/mojoPortal.Data.MySql/packages.config b/mojoPortal.Data.MySql/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Google.Protobuf" version="3.5.1" targetFramework="net462" />
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
   <package id="MySql.Data" version="8.0.12" targetFramework="net462" />
 </packages>
diff --git a/mojoPortal.Data.SQLite/mojoPortal.Data.SQLite.csproj b/mojoPortal.Data.SQLite/mojoPortal.Data.SQLite.csproj
@@ -52,7 +52,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Data.Sqlite, Version=1.0.0.0, Culture=neutral, PublicKeyToken=138411798f1650f6, processorArchitecture=MSIL">
@@ -134,6 +133,9 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/mojoPortal.Data.SQLite/packages.config b/mojoPortal.Data.SQLite/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Data.pgsql/mojoPortal.Data.pgsql.csproj b/mojoPortal.Data.pgsql/mojoPortal.Data.pgsql.csproj
@@ -59,7 +59,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Npgsql, Version=2.0.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
@@ -146,6 +145,9 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/mojoPortal.Data.pgsql/packages.config b/mojoPortal.Data.pgsql/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Features.Business/mojoPortal.Features.Business.csproj b/mojoPortal.Features.Business/mojoPortal.Features.Business.csproj
@@ -106,7 +106,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -193,6 +193,9 @@
       <Name>mojoPortal.Features.Data.SQLite</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/mojoPortal.Features.Business/packages.config b/mojoPortal.Features.Business/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Net/mojoPortal.Net.csproj b/mojoPortal.Net/mojoPortal.Net.csproj
@@ -116,7 +116,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />

diff --git a/mojoPortal.Net/packages.config b/mojoPortal.Net/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>
diff --git a/mojoPortal.Web.Editor/mojoPortal.Web.Editor.csproj b/mojoPortal.Web.Editor/mojoPortal.Web.Editor.csproj
@@ -107,7 +107,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />

diff --git a/mojoPortal.Web.Editor/packages.config b/mojoPortal.Web.Editor/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net462" />
+</packages>