Changeset 8587


Ignore:
Timestamp:
09/06/12 11:35:59 (7 years ago)
Author:
ascheibe
Message:

#1937

  • fixed wrong assembly references in project files
  • fixed cases of file names
  • removed an InvokeRequired check that Mono couldn't handle
  • changed visibility of inherited setters so that the Mono compiler doesn't crash
  • specified the namespace of the Random class so that Mono doesn't confuses it with our Random class
Location:
trunk/sources
Files:
6 deleted
10 edited
6 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Data/3.3/ValueTypeArray.cs

    r7259 r8587  
    4343    public virtual int Length {
    4444      get { return array.Length; }
    45       protected set {
     45      #region Mono Compatibility
     46      // this setter should be protected, but the Mono compiler couldn't handle it
     47      set {
    4648        if (ReadOnly) throw new NotSupportedException("Length cannot be set. ValueTypeArray is read-only.");
    4749        if (value != Length) {
     
    5052        }
    5153      }
     54      #endregion
    5255    }
    5356    public virtual T this[int index] {
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1/Plugin.cs.frame

    r6866 r8587  
    1010  [PluginFile("HeuristicLab.WinFormsUI-2.3.1.dll", PluginFileType.Assembly)]
    1111  [PluginFile("WeifenLuo.WinFormsUI.Docking-2.3.1.dll", PluginFileType.Assembly)]
    12   [PluginFile("WeifenLuo.WinformsUI.Docking License.txt",PluginFileType.License)]
     12  [PluginFile("WeifenLuo.WinFormsUI.Docking License.txt",PluginFileType.License)]
    1313  public class HeuristicLabWinFormsUIPlugin : PluginBase {
    1414  }
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

    r7259 r8587  
    197197      //mkommend: solution to resizing issues. taken from http://support.microsoft.com/kb/953934
    198198      //not implemented with a panel to reduce the number of nested controls
    199       if (Handle != null)
     199      //also cf. http://connect.microsoft.com/VisualStudio/feedback/details/98368/csc-incorrectly-allows-comparison-between-intptr-and-null
     200      if (Handle != IntPtr.Zero)
    200201        this.BeginInvoke((Action<EventArgs>)OnSizeChangedHelper, e);
    201202    }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r8334 r8587  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <Private>False</Private>
    103     </Reference>
    104101    <Reference Include="Microsoft.CSharp" />
    105102    <Reference Include="System" />
     
    152149      <SubType>UserControl</SubType>
    153150    </Compile>
    154     <Compile Include="ProblemView.designer.cs">
     151    <Compile Include="ProblemView.Designer.cs">
    155152      <DependentUpon>ProblemView.cs</DependentUpon>
    156153    </Compile>
     
    386383      <Private>False</Private>
    387384    </ProjectReference>
     385    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     386      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     387      <Name>HeuristicLab.Analysis-3.3</Name>
     388      <Private>False</Private>
     389    </ProjectReference>
    388390  </ItemGroup>
    389391  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

    r7259 r8587  
    143143    private static void SetEnabledStateOfContentViews(IStorableContent content, bool enabled) {
    144144      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>();
    145       if (mainForm.InvokeRequired)
    146         mainForm.Invoke((Action<IStorableContent, bool>)SetEnabledStateOfContentViews, content, enabled);
    147       else {
     145      #region Mono Compatibility
     146      // removed the InvokeRequired check because of Mono
     147      mainForm.Invoke((Action)delegate {
    148148        var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
    149149        views.ForEach(v => v.Enabled = enabled);
    150       }
     150      });
     151      #endregion
    151152    }
    152153  }
  • trunk/sources/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

    r8571 r8587  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
    105       <Private>False</Private>
    106     </Reference>
    107104    <Reference Include="System" />
    108     <Reference Include="System.Core">
    109       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110     </Reference>
     105    <Reference Include="System.Core" />
    111106    <Reference Include="System.Data" />
    112107    <Reference Include="System.Deployment" />
    113108    <Reference Include="System.Drawing" />
    114     <Reference Include="System.IdentityModel">
    115       <RequiredTargetFramework>3.0</RequiredTargetFramework>
    116     </Reference>
    117     <Reference Include="System.Runtime.Serialization">
    118       <RequiredTargetFramework>3.0</RequiredTargetFramework>
    119     </Reference>
    120     <Reference Include="System.ServiceModel">
    121       <RequiredTargetFramework>3.0</RequiredTargetFramework>
    122     </Reference>
     109    <Reference Include="System.IdentityModel" />
     110    <Reference Include="System.Runtime.Serialization" />
     111    <Reference Include="System.ServiceModel" />
    123112    <Reference Include="System.Windows.Forms" />
    124113    <Reference Include="System.Xml" />
     114    <Reference Include="ICSharpCode.SharpZipLib">
     115      <HintPath>ICSharpCode.SharpZipLib.dll</HintPath>
     116    </Reference>
    125117  </ItemGroup>
    126118  <ItemGroup>
  • trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Resources.resx

    r6413 r8587  
    123123  </data>
    124124  <data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
    125     <value>Resources\vs2008imagelibrary_commonelements_objects_arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     125    <value>Resources\VS2008ImageLibrary_CommonElements_Objects_Arrow_Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    126126  </data>
    127127  <data name="Assembly" type="System.Resources.ResXFileRef, System.Windows.Forms">
    128     <value>Resources\vs2008imagelibrary_objects_assembly.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     128    <value>Resources\VS2008ImageLibrary_Objects_Assembly.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    129129  </data>
    130130  <data name="Document" type="System.Resources.ResXFileRef, System.Windows.Forms">
     
    150150  </data>
    151151  <data name="Install" type="System.Resources.ResXFileRef, System.Windows.Forms">
    152     <value>Resources\vs2008imagelibrary_objects_install.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     152    <value>Resources\VS2008ImageLibrary_Objects_Install.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    153153  </data>
    154154  <data name="Internet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     
    195195  </data>
    196196  <data name="UpdateAvailable" type="System.Resources.ResXFileRef, System.Windows.Forms">
    197     <value>resources\updateavailable.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     197    <value>Resources\UpdateAvailable.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    198198  </data>
    199199</root>
  • trunk/sources/HeuristicLab.Problems.LawnMower/3.3/HeuristicLab.Problems.LawnMower.csproj

    r8132 r8587  
    103103  </PropertyGroup>
    104104  <ItemGroup>
    105     <Reference Include="HeuristicLab.Common-3.3">
    106       <HintPath>..\..\HeuristicLab.Common\3.3\obj\x86\Debug\HeuristicLab.Common-3.3.dll</HintPath>
    107       <Private>False</Private>
    108     </Reference>
    109105    <Reference Include="System" />
    110106    <Reference Include="System.Core" />
     
    176172      <Private>False</Private>
    177173    </ProjectReference>
     174    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     175      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     176      <Name>HeuristicLab.Common-3.3</Name>
     177      <Private>False</Private>
     178    </ProjectReference>
    178179  </ItemGroup>
    179180  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs

    r7259 r8587  
    4444      set { Parameters["s^2s"].ActualValue = value; }
    4545    }
    46     private static Random Random = new Random();
     46    private static System.Random Random = new System.Random();
    4747
    4848    private Dictionary<int, List<RealVector>> stdCenters;
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RealVectorAdditiveMoveWrapper.cs

    r7259 r8587  
    6666        return vector.Length;
    6767      }
    68       protected set {
     68      #region Mono Compatibility
     69      // this setter should be protected, but the Mono compiler couldn't handle it
     70      set {
    6971        throw new System.NotSupportedException("Error: Setting the lenght of the wrapper is not allowed.");
    7072      }
     73      #endregion
    7174    }
    7275  }
Note: See TracChangeset for help on using the changeset viewer.