Changeset 13023


Ignore:
Timestamp:
10/16/15 12:03:51 (4 years ago)
Author:
gkronber
Message:

#1966: fixed build configuration

Location:
branches/HeuristicLab.BinPacking
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.BinPacking.sln

    r13020 r13023  
    2727    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2828    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
    29     {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    30     {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Mixed Platforms.Build.0 = Debug|x86
     29    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     30    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    3131    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x64.ActiveCfg = Debug|x64
    3232    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x64.Build.0 = Debug|x64
     
    3535    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3636    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Any CPU.Build.0 = Release|Any CPU
    37     {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Mixed Platforms.ActiveCfg = Release|x86
    38     {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Mixed Platforms.Build.0 = Release|x86
     37    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     38    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    3939    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x64.ActiveCfg = Release|x64
    4040    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x64.Build.0 = Release|x64
     
    4343    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    4444    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
    45     {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    46     {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Mixed Platforms.Build.0 = Debug|x86
     45    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     46    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    4747    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|x64.ActiveCfg = Debug|x64
    4848    {78763A4E-E163-48C2-98EB-709760D06F25}.Debug|x64.Build.0 = Debug|x64
     
    5151    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5252    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Any CPU.Build.0 = Release|Any CPU
    53     {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Mixed Platforms.ActiveCfg = Release|x86
    54     {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Mixed Platforms.Build.0 = Release|x86
     53    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     54    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    5555    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|x64.ActiveCfg = Release|x64
    5656    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|x64.Build.0 = Release|x64
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

    r13020 r13023  
    151151  </ItemGroup>
    152152  <ItemGroup>
    153     <Compile Include="Problems\CuboidIdenticalBinPackingProblemView.cs">
    154       <SubType>UserControl</SubType>
    155     </Compile>
     153    <None Include="HeuristicLab.snk" />
     154    <Compile Include="Problems\CuboidIdenticalBinPackingProblemView.cs" />
    156155    <Compile Include="Problems\CuboidIdenticalBinPackingProblemView.Designer.cs">
    157156      <DependentUpon>CuboidIdenticalBinPackingProblemView.cs</DependentUpon>
    158157    </Compile>
    159     <Compile Include="Problems\RectangularIdenticalBinPackingProblemView.cs">
    160       <SubType>UserControl</SubType>
    161     </Compile>
     158    <Compile Include="Problems\RectangularIdenticalBinPackingProblemView.cs" />
    162159    <Compile Include="Problems\RectangularIdenticalBinPackingProblemView.Designer.cs">
    163160      <DependentUpon>RectangularIdenticalBinPackingProblemView.cs</DependentUpon>
    164     </Compile>
    165     <None Include="HeuristicLab.snk" />
    166     <Compile Include="PackingPlans\PackingPlan2DView.cs">
    167       <SubType>UserControl</SubType>
    168     </Compile>
    169     <Compile Include="PackingPlans\PackingPlan2DView.Designer.cs">
    170       <DependentUpon>PackingPlan2DView.cs</DependentUpon>
    171     </Compile>
    172     <Compile Include="Shapes\CuboidPackingItemView.cs">
    173       <SubType>UserControl</SubType>
    174     </Compile>
    175     <Compile Include="Shapes\CuboidPackingItemView.Designer.cs">
    176       <DependentUpon>CuboidPackingItemView.cs</DependentUpon>
    177     </Compile>
    178     <Compile Include="Shapes\RectangularPackingItemView.cs">
    179       <SubType>UserControl</SubType>
    180     </Compile>
    181     <Compile Include="Shapes\RectangularPackingItemView.Designer.cs">
    182       <DependentUpon>RectangularPackingItemView.cs</DependentUpon>
    183     </Compile>
    184     <Compile Include="Shapes\CuboidPackingShapeView.cs">
    185       <SubType>UserControl</SubType>
    186     </Compile>
    187     <Compile Include="Shapes\CuboidPackingShapeView.Designer.cs">
    188       <DependentUpon>CuboidPackingShapeView.cs</DependentUpon>
    189     </Compile>
    190     <Compile Include="Shapes\RectangularPackingShapeView.cs">
    191       <SubType>UserControl</SubType>
    192     </Compile>
    193     <Compile Include="Shapes\RectangularPackingShapeView.Designer.cs">
    194       <DependentUpon>RectangularPackingShapeView.cs</DependentUpon>
    195     </Compile>
    196     <Compile Include="PackingPlans\PackingPlan3DView.cs">
    197       <SubType>UserControl</SubType>
    198     </Compile>
    199     <Compile Include="PackingPlans\PackingPlan3DView.Designer.cs">
    200       <DependentUpon>PackingPlan3DView.cs</DependentUpon>
    201161    </Compile>
    202162    <Compile Include="Plugin.cs" />
     
    213173  </ItemGroup>
    214174  <ItemGroup>
    215     <EmbeddedResource Include="PackingPlans\PackingPlan2DView.resx">
    216       <DependentUpon>PackingPlan2DView.cs</DependentUpon>
    217     </EmbeddedResource>
    218     <EmbeddedResource Include="Shapes\CuboidPackingItemView.resx">
    219       <DependentUpon>CuboidPackingItemView.cs</DependentUpon>
    220     </EmbeddedResource>
    221     <EmbeddedResource Include="Shapes\RectangularPackingItemView.resx">
    222       <DependentUpon>RectangularPackingItemView.cs</DependentUpon>
    223     </EmbeddedResource>
    224     <EmbeddedResource Include="Shapes\CuboidPackingShapeView.resx">
    225       <DependentUpon>CuboidPackingShapeView.cs</DependentUpon>
    226     </EmbeddedResource>
    227175    <EmbeddedResource Include="Problems\RectangularIdenticalBinPackingProblemView.resx">
    228176      <DependentUpon>RectangularIdenticalBinPackingProblemView.cs</DependentUpon>
    229177    </EmbeddedResource>
    230     <EmbeddedResource Include="Shapes\RectangularPackingShapeView.resx">
    231       <DependentUpon>RectangularPackingShapeView.cs</DependentUpon>
    232     </EmbeddedResource>
    233     <EmbeddedResource Include="PackingPlans\PackingPlan3DView.resx">
    234       <DependentUpon>PackingPlan3DView.cs</DependentUpon>
    235     </EmbeddedResource>
     178  </ItemGroup>
     179  <ItemGroup>
     180    <Folder Include="PackingPlans\" />
     181    <Folder Include="Shapes\" />
    236182  </ItemGroup>
    237183  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPInstanceProvider.cs

    r9348 r13023  
    2626using System.Reflection;
    2727using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    2928
    3029namespace HeuristicLab.Problems.Instances.BinPacking {
Note: See TracChangeset for help on using the changeset viewer.