Domů Procházet Nápověda
Registrovat se Přihlásit se
GFG_New
/
ET9_WebGL_Dev
2
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

更新nuget库

tanghai před 11 roky
rodič
000b428cf1
revize
7e2e3a53aa
9 změnil soubory, kde provedl 75 přidání a 43 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 12 8
      CSharp/App/Editor/Editor.csproj
  2. 2 2
      CSharp/App/Editor/Packages.config
  3. 9 1
      CSharp/App/Editor/app.config
  4. 12 8
      CSharp/App/Infrastructure/Infrastructure.csproj
  5. 2 2
      CSharp/App/Infrastructure/Packages.config
  6. 12 4
      CSharp/App/Infrastructure/app.config
  7. 12 12
      CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj
  8. 2 2
      CSharp/App/Modules/BehaviorTreeModule/Packages.config
  9. 12 4
      CSharp/App/Modules/BehaviorTreeModule/app.config

+ 12 - 8
CSharp/App/Editor/Editor.csproj
Zobrazit soubor 

@@ -70,17 +70,21 @@
 
       <HintPath>..\..\packages\Prism.MEFExtensions.5.0.0\lib\NET45\Microsoft.Practices.Prism.MefExtensions.dll</HintPath>

       <Private>True</Private>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.PubSubEvents">

-      <HintPath>..\..\packages\Prism.PubSubEvents.1.0.0\lib\portable-sl4+wp7+windows8+net40\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.PubSubEvents, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.PubSubEvents.1.1.2\lib\portable-sl5+windowsphone8+windows8+net40+wpa81\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

     </Reference>

     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

+ 2 - 2
CSharp/App/Editor/Packages.config
Zobrazit soubor 

@@ -5,6 +5,6 @@
 
   <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.0.0" targetFramework="net45" />

-  <package id="Prism.PubSubEvents" version="1.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>

+ 9 - 1
CSharp/App/Editor/app.config
Zobrazit soubor 

@@ -18,6 +18,14 @@
 
 				<assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />

 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.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" />

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

+			</dependentAssembly>

 		</assemblyBinding>

 	</runtime>

 	<startup>

@@ -28,7 +36,7 @@
 
 		<add key="Port" value="8888" />

 		<add key="Account" value="egametang@163.com" />

 		<add key="Password" value="163bio1" />

-		<add key="NodePath" value="D:\Source\Demo\battledemo\Assets\Resources\Config\node.bytes" />

+		<add key="NodePath" value="E:\Source\Demo\battledemo\Assets\Resources\Config\node.bytes" />

 	</appSettings>

+ 12 - 8
CSharp/App/Infrastructure/Infrastructure.csproj
Zobrazit soubor 

@@ -46,17 +46,21 @@
 
     <Reference Include="Microsoft.Practices.Prism.MefExtensions">

       <HintPath>..\..\packages\Prism.MEFExtensions.5.0.0\lib\NET45\Microsoft.Practices.Prism.MefExtensions.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.PubSubEvents">

-      <HintPath>..\..\packages\Prism.PubSubEvents.1.0.0\lib\portable-sl4+wp7+windows8+net40\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.PubSubEvents, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.PubSubEvents.1.1.2\lib\portable-sl5+windowsphone8+windows8+net40+wpa81\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces">

-      <HintPath>..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

+    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

     </Reference>

     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

+ 2 - 2
CSharp/App/Infrastructure/Packages.config
Zobrazit soubor 

@@ -5,6 +5,6 @@
 
   <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.0.0" targetFramework="net45" />

-  <package id="Prism.PubSubEvents" version="1.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>

+ 12 - 4
CSharp/App/Infrastructure/app.config
Zobrazit soubor 

@@ -1,11 +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.SharedInterfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.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" />

       </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.1" /></startup></configuration>

+ 12 - 12
CSharp/App/Modules/BehaviorTreeModule/BehaviorTreeModule.csproj
Zobrazit soubor 

@@ -50,21 +50,21 @@
 
       <HintPath>..\..\..\packages\Prism.MEFExtensions.5.0.0\lib\NET45\Microsoft.Practices.Prism.MefExtensions.dll</HintPath>

       <Private>True</Private>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm">

-      <HintPath>..\..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

-      <Private>True</Private>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop">

-      <HintPath>..\..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

-      <Private>True</Private>

+    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.PubSubEvents">

-      <HintPath>..\..\..\packages\Prism.PubSubEvents.1.0.0\lib\portable-sl4+wp7+windows8+net40\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

-      <Private>True</Private>

+    <Reference Include="Microsoft.Practices.Prism.PubSubEvents, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Prism.PubSubEvents.1.1.2\lib\portable-sl5+windowsphone8+windows8+net40+wpa81\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>

     </Reference>

-    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces">

-      <HintPath>..\..\..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

-      <Private>True</Private>

+    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>

     </Reference>

     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

+ 2 - 2
CSharp/App/Modules/BehaviorTreeModule/Packages.config
Zobrazit soubor 

@@ -5,6 +5,6 @@
 
   <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.0.0" targetFramework="net45" />

-  <package id="Prism.PubSubEvents" version="1.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>

+ 12 - 4
CSharp/App/Modules/BehaviorTreeModule/app.config
Zobrazit soubor 

@@ -1,11 +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.SharedInterfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.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" />

       </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.1" /></startup></configuration>