Changeset 12546 for trunk/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

Timestamp:

06/30/15 12:31:15 (10 years ago)

Author:

dglaser

Message:

#2394:

HeuristicLab.Services.WebApp.Status:

• added used / total cores
• moved kb to gb filter to WebApp

HeuristicLab.Services.WebApp:

• added about page
• added filter

File:

• trunk/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj (modified) (8 diffs)

trunk/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

@@ -23 +23 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <WebGreaseLibPath>..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -44 +43 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -53 +52 @@
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -118 +117 @@
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
-    </Reference>
-    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
-      <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -169 +164 @@
     <Content Include="WebApp\libs\smoothScroll\smoothScroll.js" />
     <Content Include="WebApp\app.js" />
-    <Content Include="WebApp\plugins\login\login.css">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebApp\plugins\login\login.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebApp\plugins\login\loginCtrl.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="WebApp\plugins\about\about.js" />
+    <Content Include="WebApp\plugins\about\aboutCtrl.js" />
+    <Content Include="WebApp\plugins\login\login.css" />
+    <Content Include="WebApp\plugins\login\login.js" />
+    <Content Include="WebApp\plugins\login\loginCtrl.js" />
     <Content Include="WebApp\plugins\plugins\pluginsExceptionCtrl.js" />
-    <Content Include="WebApp\plugins\plugins\plugins.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebApp\plugins\plugins\pluginsCtrl.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="WebApp\plugins\plugins\plugins.js" />
+    <Content Include="WebApp\plugins\plugins\pluginsCtrl.js" />
     <Content Include="WebApp\plugins\plugins\pluginsService.js" />
     <Content Include="WebApp\shared\directives\flot.js" />
@@ -226 +213 @@
     <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff" />
     <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
+    <Content Include="WebApp\shared\filter\filters.js" />
     <Content Include="WebApp\shared\images\HeuristicLab-Logo.png" />
     <Content Include="WebApp\shared\layout\layout.cshtml" />
@@ -233 +221 @@
     <Content Include="WebApp\shared\menu\menu.cshtml" />
     <Content Include="WebApp\shared\restricted\empty.cshtml" />
-    <Content Include="WebApp\plugins\login\login.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebApp\plugins\plugins\plugins.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebApp\plugins\plugins\Web.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="WebApp\plugins\login\login.cshtml" />
+    <Content Include="WebApp\plugins\plugins\plugins.cshtml" />
+    <Content Include="WebApp\plugins\plugins\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -259 +241 @@
       <Name>HeuristicLab.Services.Hive-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="WebApp\plugins\about\about.cshtml" />
   </ItemGroup>
   <PropertyGroup>