Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/08/19 00:23:12 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:
stable
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Services.WebApp.Statistics

  • stable/HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj

    r17097 r17105  
    7575  </PropertyGroup>
    7676  <ItemGroup>
    77     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    78       <Private>False</Private>
    79       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
    80     </Reference>
    81     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    82       <SpecificVersion>False</SpecificVersion>
    83       <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    84       <Private>False</Private>
    85     </Reference>
    8677    <Reference Include="System" />
    8778    <Reference Include="System.Core" />
    8879    <Reference Include="System.Net.Http" />
    89     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    90       <SpecificVersion>False</SpecificVersion>
    91       <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    92       <Private>False</Private>
    93     </Reference>
    9480    <Reference Include="System.Web" />
    95     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    96       <SpecificVersion>False</SpecificVersion>
    97       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
    98       <Private>False</Private>
    99     </Reference>
    100     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    101       <SpecificVersion>False</SpecificVersion>
    102       <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
    103       <Private>False</Private>
    104     </Reference>
    105     <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    106       <SpecificVersion>False</SpecificVersion>
    107       <HintPath>..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
    108       <Private>False</Private>
    109     </Reference>
    110     <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    111       <SpecificVersion>False</SpecificVersion>
    112       <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
    113       <Private>False</Private>
    114     </Reference>
    115     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    116       <SpecificVersion>False</SpecificVersion>
    117       <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
    118       <Private>False</Private>
    119     </Reference>
    120     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    121       <SpecificVersion>False</SpecificVersion>
    122       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
    123       <Private>False</Private>
    124     </Reference>
    125     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    126       <SpecificVersion>False</SpecificVersion>
    127       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
    128       <Private>False</Private>
    129     </Reference>
    130     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    131       <SpecificVersion>False</SpecificVersion>
    132       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
    133       <Private>False</Private>
    134     </Reference>
    13581    <Reference Include="System.Xml.Linq" />
    13682    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    232178    <None Include="HeuristicLab.snk" />
    233179    <Content Include="Properties\AssemblyInfo.cs.frame" />
    234     <None Include="packages.config" />
    235180    <Content Include="Web.config">
    236181      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    … …  
    273218    </Content>
    274219  </ItemGroup>
    275   <ItemGroup />
     220  <ItemGroup>
     221    <PackageReference Include="Microsoft.AspNet.Mvc">
     222      <Version>5.2.3</Version>
     223    </PackageReference>
     224    <PackageReference Include="Microsoft.AspNet.WebApi">
     225      <Version>5.2.3</Version>
     226    </PackageReference>
     227    <PackageReference Include="Newtonsoft.Json">
     228      <Version>7.0.1</Version>
     229    </PackageReference>
     230  </ItemGroup>
    276231  <ItemGroup>
    277232    <ProjectReference Include="..\..\HeuristicLab.Services.Access\3.3\HeuristicLab.Services.Access-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.