升级NLog库

CSharp/App/Editor/Editor.csproj

@@ -129,10 +129,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
@@ -195,7 +191,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
-    <None Include="Packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">

CSharp/App/Editor/Packages.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
-  <package id="NLog" version="4.1.0" targetFramework="net452" />
-  <package id="Prism" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Composition" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Interactivity" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.MEFExtensions" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Mvvm" version="1.1.1" targetFramework="net451" />
-  <package id="Prism.PubSubEvents" version="1.1.2" targetFramework="net451" />
-</packages>

CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj

@@ -114,7 +114,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="AllTreeView.xaml">

CSharp/App/Modules/BehaviorTreeModule/Packages.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
-  <package id="MongoDB.Bson" version="2.0.1" targetFramework="net451" />
-  <package id="Prism" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Composition" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Interactivity" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.MEFExtensions" version="5.0.0" targetFramework="net45" />
-  <package id="Prism.Mvvm" version="1.1.1" targetFramework="net451" />
-  <package id="Prism.PubSubEvents" version="1.1.2" targetFramework="net451" />
-</packages>

CSharp/Platform/Common/Common.csproj

@@ -35,9 +35,8 @@
       <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NLog">
+      <HintPath>..\..\packages\NLog.4.1.1\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

CSharp/ThirdParty/Nuget/Nuget.csproj

@@ -68,8 +68,8 @@
       <HintPath>..\..\packages\MongoDB.Driver.Core.2.0.1\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NLog.4.1.1\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework">

CSharp/ThirdParty/Nuget/app.config

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Prism.PubSubEvents" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Prism.PubSubEvents" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Prism.SharedInterfaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Prism.SharedInterfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>

CSharp/ThirdParty/Nuget/packages.config

@@ -5,7 +5,7 @@
   <package id="MongoDB.Bson" version="2.0.1" targetFramework="net45" />
   <package id="MongoDB.Driver" version="2.0.1" targetFramework="net45" />
   <package id="MongoDB.Driver.Core" version="2.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.1.0" targetFramework="net452" />
+  <package id="NLog" version="4.1.1" targetFramework="net46" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="Prism" version="5.0.0" targetFramework="net45" />
   <package id="Prism.Composition" version="5.0.0" targetFramework="net45" />