Inicio Explorar Axuda
Rexistro Iniciar sesión
GFG_New
/
ET9_WebGL_Dev
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

升级工程到VS2015

tanghai %!s(int64=10) %!d(string=hai) anos
pai
e75878d681
achega
2be3328da2
Modificáronse 23 ficheiros con 83 adicións e 70 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 5 1
      CSharp/App/Editor/Editor.csproj
  2. 1 0
      CSharp/App/Editor/Packages.config
  3. 1 1
      CSharp/App/Editor/app.config
  4. 1 1
      CSharp/App/Infrastructure/Infrastructure.csproj
  5. 1 1
      CSharp/App/Infrastructure/app.config
  6. 1 1
      CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj
  7. 1 1
      CSharp/App/Modules/BehaviorTreeModule/app.config
  8. 3 3
      CSharp/Exe/Profile/App.config
  9. 3 2
      CSharp/Exe/Profile/Profile.csproj
  10. 10 5
      CSharp/Game/Controller/Controller.csproj
  11. 1 1
      CSharp/Game/Model/Component/UnitComponent.cs
  12. 6 9
      CSharp/Game/Model/Model.csproj
  13. 9 7
      CSharp/Platform/Common/Common.csproj
  14. 6 6
      CSharp/Platform/ENet/ENet.vcxproj
  15. 1 1
      CSharp/Platform/ENet/enet/enet.h
  16. 6 5
      CSharp/Platform/TNet/TNet.csproj
  17. 3 2
      CSharp/Platform/UNet/UNet.csproj
  18. 12 10
      CSharp/Test/ModelTest/ModelTest.csproj
  19. 3 2
      CSharp/Test/TNetTest/TNetTest.csproj
  20. 3 2
      CSharp/Test/UNetTest/UNetTest.csproj
  21. 4 7
      CSharp/ThirdParty/Nuget/Nuget.csproj
  22. 1 1
      CSharp/ThirdParty/Nuget/app.config
  23. 1 1
      CSharp/ThirdParty/Nuget/packages.config

+ 5 - 1
CSharp/App/Editor/Editor.csproj
Ver ficheiro 

@@ -10,7 +10,7 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>App.Editor</RootNamespace>

     <AssemblyName>Editor</AssemblyName>

-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <TargetFrameworkProfile>

     </TargetFrameworkProfile>

     <FileAlignment>512</FileAlignment>

@@ -129,6 +129,10 @@
 
       <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" />

+ 1 - 0
CSharp/App/Editor/Packages.config
Ver ficheiro 

@@ -1,6 +1,7 @@
 
 <?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" />

+ 1 - 1
CSharp/App/Editor/app.config
Ver ficheiro 

@@ -29,7 +29,7 @@
 
     </assemblyBinding>

   </runtime>

   <startup>

-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />

+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />

   </startup>

   <appSettings>

     <add key="NodePath" value="D:\Source\SLOL\Program\Unity\Assets\Resources\Config\" />

+ 1 - 1
CSharp/App/Infrastructure/Infrastructure.csproj
Ver ficheiro 

@@ -10,7 +10,7 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>App.Infrastructure</RootNamespace>

     <AssemblyName>Infrastructure</AssemblyName>

-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\CSharp\</SolutionDir>

     <RestorePackages>true</RestorePackages>

+ 1 - 1
CSharp/App/Infrastructure/app.config
Ver ficheiro 

@@ -16,4 +16,4 @@
 
       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>

+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

+ 1 - 1
CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj
Ver ficheiro 

@@ -10,7 +10,7 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Modules.BehaviorTreeModule</RootNamespace>

     <AssemblyName>BehaviorTreeModule</AssemblyName>

-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <Utf8Output>true</Utf8Output>

     <ExpressionBlendVersion>4.0.20621.0</ExpressionBlendVersion>

+ 1 - 1
CSharp/App/Modules/BehaviorTreeModule/app.config
Ver ficheiro 

@@ -16,4 +16,4 @@
 
       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup></configuration>

+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

+ 3 - 3
CSharp/Exe/Profile/App.config
Ver ficheiro 

@@ -1,6 +1,6 @@
 
-<?xml version="1.0" encoding="utf-8" ?>

+<?xml version="1.0" encoding="utf-8"?>

 <configuration>

     <startup> 

-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>

     </startup>

-</configuration>
 
+</configuration>

+ 3 - 2
CSharp/Exe/Profile/Profile.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Profile</RootNamespace>

     <AssemblyName>Profile</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <PlatformTarget>AnyCPU</PlatformTarget>

+ 10 - 5
CSharp/Game/Controller/Controller.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Controller</RootNamespace>

     <AssemblyName>Controller</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -30,9 +31,13 @@
 
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="MongoDB.Bson, Version=2.0.0.828, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.0\lib\net45\MongoDB.Bson.dll</HintPath>

+    <Reference Include="MongoDB.Bson, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <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>

     <Reference Include="System" />

     <Reference Include="System.Core" />

+ 1 - 1
CSharp/Game/Model/Component/UnitComponent.cs
Ver ficheiro 

@@ -44,7 +44,7 @@ namespace Model
 
 		{

 			if (unit == null)

 			{

-				throw new ArgumentNullException("unit");

+				throw new ArgumentNullException(nameof(unit));

 			}

 			if (!this.units.Remove(unit.Id))

 			{

+ 6 - 9
CSharp/Game/Model/Model.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Model</RootNamespace>

     <AssemblyName>Model</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -33,13 +34,9 @@
 
     <Reference Include="CommandLine">

       <HintPath>..\..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>

     </Reference>

-    <Reference Include="MongoDB.Bson, Version=2.0.0.828, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.0\lib\net45\MongoDB.Bson.dll</HintPath>

-    </Reference>

-    <Reference Include="MongoDB.Driver, Version=2.0.0.828, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Driver.2.0.0\lib\net45\MongoDB.Driver.dll</HintPath>

+    <Reference Include="MongoDB.Bson, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>

+      <Private>True</Private>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core" />

+ 9 - 7
CSharp/Platform/Common/Common.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Common</RootNamespace>

     <AssemblyName>Common</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -30,12 +31,13 @@
 
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="MongoDB.Bson">

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.0\lib\net45\MongoDB.Bson.dll</HintPath>

+    <Reference Include="MongoDB.Bson, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>

+      <Private>True</Private>

     </Reference>

-    <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 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="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

+ 6 - 6
CSharp/Platform/ENet/ENet.vcxproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Debug|Win32">

       <Configuration>Debug</Configuration>

@@ -20,7 +20,7 @@
 
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{C9992B7C-313E-4C9F-A954-640D01EDFB58}</ProjectGuid>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <Keyword>ManagedCProj</Keyword>

     <RootNamespace>ENet</RootNamespace>

     <ProjectName>ENet</ProjectName>

@@ -29,28 +29,28 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v120</PlatformToolset>

+    <PlatformToolset>v140</PlatformToolset>

     <CLRSupport>false</CLRSupport>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v120_xp</PlatformToolset>

+    <PlatformToolset>v140_xp</PlatformToolset>

     <CLRSupport>false</CLRSupport>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v120</PlatformToolset>

+    <PlatformToolset>v140</PlatformToolset>

     <CLRSupport>false</CLRSupport>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v120</PlatformToolset>

+    <PlatformToolset>v140</PlatformToolset>

     <CLRSupport>false</CLRSupport>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

+ 1 - 1
CSharp/Platform/ENet/enet/enet.h
Ver ficheiro 

@@ -223,7 +223,7 @@ enum
 
    ENET_PEER_PACKET_LOSS_INTERVAL         = 10000,
 
    ENET_PEER_WINDOW_SIZE_SCALE            = 64 * 1024,
 
    ENET_PEER_TIMEOUT_LIMIT                = 32,
 
-   ENET_PEER_TIMEOUT_MINIMUM              = 5000,
 
+   ENET_PEER_TIMEOUT_MINIMUM              = 29000,
 
    ENET_PEER_TIMEOUT_MAXIMUM              = 30000,
 
    ENET_PEER_PING_INTERVAL                = 500,
 
    ENET_PEER_UNSEQUENCED_WINDOWS          = 64,

+ 6 - 5
CSharp/Platform/TNet/TNet.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>TNet</RootNamespace>

     <AssemblyName>TNet</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -30,9 +31,9 @@
 
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="MongoDB.Bson, Version=2.0.0.828, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.0\lib\net45\MongoDB.Bson.dll</HintPath>

+    <Reference Include="MongoDB.Bson, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>

+      <Private>True</Private>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core" />

+ 3 - 2
CSharp/Platform/UNet/UNet.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>UNet</RootNamespace>

     <AssemblyName>UNet</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

+ 12 - 10
CSharp/Test/ModelTest/ModelTest.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>ModelTest</RootNamespace>

     <AssemblyName>ModelTest</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -30,16 +31,17 @@
 
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="MongoDB.Bson, Version=2.0.0.788, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.0-rc0\lib\net45\MongoDB.Bson.dll</HintPath>

+    <Reference Include="MongoDB.Bson, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>

+      <Private>True</Private>

     </Reference>

-    <Reference Include="MongoDB.Driver, Version=2.0.0.788, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\packages\MongoDB.Driver.2.0.0-rc0\lib\net45\MongoDB.Driver.dll</HintPath>

+    <Reference Include="MongoDB.Driver, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Driver.2.0.1\lib\net45\MongoDB.Driver.dll</HintPath>

+      <Private>True</Private>

     </Reference>

-    <Reference Include="MongoDB.Driver.Core">

-      <HintPath>..\..\packages\MongoDB.Driver.Core.2.0.0-rc0\lib\net45\MongoDB.Driver.Core.dll</HintPath>

+    <Reference Include="MongoDB.Driver.Core, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\MongoDB.Driver.Core.2.0.1\lib\net45\MongoDB.Driver.Core.dll</HintPath>

+      <Private>True</Private>

     </Reference>

     <Reference Include="nunit.framework">

       <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

+ 3 - 2
CSharp/Test/TNetTest/TNetTest.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>TNetTest</RootNamespace>

     <AssemblyName>TNetTest</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

+ 3 - 2
CSharp/Test/UNetTest/UNetTest.csproj
Ver ficheiro 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

@@ -9,8 +9,9 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>UNetTest</RootNamespace>

     <AssemblyName>UNetTest</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

+ 4 - 7
CSharp/ThirdParty/Nuget/Nuget.csproj
Ver ficheiro 

@@ -9,10 +9,11 @@
 
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Nuget</RootNamespace>

     <AssemblyName>Nuget</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>

     <RestorePackages>true</RestorePackages>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -59,10 +60,6 @@
 
     <Reference Include="Microsoft.Practices.ServiceLocation">

       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>

     </Reference>

-    <Reference Include="MongoDB.Bson, Version=2.0.0.828, Culture=neutral, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\MongoDB.Bson.2.0.1\lib\net45\MongoDB.Bson.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

     <Reference Include="MongoDB.Driver, Version=2.0.1.27, Culture=neutral, processorArchitecture=MSIL">

       <HintPath>..\..\packages\MongoDB.Driver.2.0.1\lib\net45\MongoDB.Driver.dll</HintPath>

       <Private>True</Private>

@@ -71,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.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>

+    <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="nunit.framework">

+ 1 - 1
CSharp/ThirdParty/Nuget/app.config
Ver ficheiro 

@@ -16,4 +16,4 @@
 
       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-</configuration>
 
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

+ 1 - 1
CSharp/ThirdParty/Nuget/packages.config
Ver ficheiro 

@@ -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.0.1" targetFramework="net45" />

+  <package id="NLog" version="4.1.0" targetFramework="net452" />

   <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" />