diff --git a/VectoCore/VectoCore.csproj b/VectoCore/VectoCore.csproj index 3202d72eceb770b754aec54527205b86e03566af..f9258f000cdc40ff6e1867a82822254aadfb9d49 100644 --- a/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore.csproj @@ -44,8 +44,9 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> - <Reference Include="NLog"> - <HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath> + <Reference Include="NLog, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -75,6 +76,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/VectoCore/app.config b/VectoCore/app.config new file mode 100644 index 0000000000000000000000000000000000000000..7f279331e14fb095401a25447f096ba16ab43f37 --- /dev/null +++ b/VectoCore/app.config @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> \ No newline at end of file diff --git a/VectoCore/packages.config b/VectoCore/packages.config index 8cb64e159edec02c4b6d19bf674981c8477c26d6..d4a3fcac5d0e232c1e87c07329653f01d5301fc5 100644 --- a/VectoCore/packages.config +++ b/VectoCore/packages.config @@ -4,5 +4,5 @@ <package id="Common.Logging.Core" version="3.0.0" targetFramework="net45" /> <package id="Common.Logging.NLog31" version="3.0.0" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> - <package id="NLog" version="3.1.0.0" targetFramework="net45" /> + <package id="NLog" version="3.2.0.0" targetFramework="net45" /> </packages> \ No newline at end of file diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj index faace054139399ce76b0d6d6159a9ad4afc198cf..dd06cc253a1c2a006bb43f5bcae1bccbe4e3562f 100644 --- a/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCoreTest/VectoCoreTest.csproj @@ -59,6 +59,9 @@ <Name>VectoCore</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Choose> <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> <ItemGroup> diff --git a/VectoCoreTest/app.config b/VectoCoreTest/app.config new file mode 100644 index 0000000000000000000000000000000000000000..7f279331e14fb095401a25447f096ba16ab43f37 --- /dev/null +++ b/VectoCoreTest/app.config @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> \ No newline at end of file