Changeset 15780


Ignore:
Timestamp:
02/15/18 11:03:40 (4 years ago)
Author:
bburlacu
Message:

#2895: Fix resource path, add plugin frame files, change .NET version for all projects to 4.5

Location:
branches/2895_PushGP_GenealogyAnalysis
Files:
2 added
2 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis

    • Property svn:ignore set to
      Plugin.cs

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis

    • Property svn:ignore

      •  

        old new  
        1212*.nuget.props
        1313*.nuget.targets
         14Plugin.cs

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis.csproj

    r15771 r15780  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis</AssemblyName>
    12     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     10    <RootNamespace>HeuristicLab.Problems.ProgramSynthesis</RootNamespace>
     11    <AssemblyName>HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis-3.3</AssemblyName>
     12    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    107108    <Compile Include="Operators\Interfaces\IManipulatorOperator.cs" />
    108109    <Compile Include="Operators\RemovePopulationGraphFromResults.cs" />
     110    <Compile Include="Plugin.cs" />
    109111    <Compile Include="Properties\AssemblyInfo.cs" />
    110112  </ItemGroup>
     113  <ItemGroup>
     114    <None Include="Plugin.cs.frame" />
     115  </ItemGroup>
    111116  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     117  <PropertyGroup>
     118    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     119set ProjectDir=$(ProjectDir)
     120set SolutionDir=$(SolutionDir)
     121set Outdir=$(Outdir)
     122
     123call PreBuildEvent.cmd
     124</PreBuildEvent>
     125  </PropertyGroup>
    112126</Project>

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis/Plugin.cs.frame

    r15771 r15780  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323
    2424namespace HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis {
    25   [Plugin("HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis", "Provides operators and related classes for genealogy analysis.", "3.4.5.$WCREV$")]
    26   [PluginFile("HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysisg-3.4.dll", PluginFileType.Assembly)]
     25  [Plugin("HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis", "Provides operators and related classes for genealogy analysis.", "3.3.1.$WCREV$")]
     26  [PluginFile("HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysis-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    2828  [PluginDependency("HeuristicLab.Collections", "3.3")]
    … …  
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3939
    40   public class HeuristicLab.Problems.ProgramSynthesis.GenealogyAnalysisPlugin : PluginBase {
     40  public class HeuristicLabProblemsProgramSynthesisGenealogyAnalysisPlugin : PluginBase {
    4141  }
    4242}

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.Views

    • Property svn:ignore

      •  

        old new  
        1212*.nuget.props
        1313*.nuget.targets
         14Plugin.cs

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis.Views/HeuristicLab.Problems.ProgramSynthesis.Views.csproj

    r15771 r15780  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.Problems.ProgramSynthesis.Views</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.ProgramSynthesis.Views</AssemblyName>
    12     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     11    <AssemblyName>HeuristicLab.Problems.ProgramSynthesis.Views-3.3</AssemblyName>
     12    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    5253    </Reference>
    5354    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec">
     55      <Private>False</Private>
     56    </Reference>
     57    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     58      <SpecificVersion>False</SpecificVersion>
     59      <HintPath>..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    5460      <Private>False</Private>
    5561    </Reference>
    … …  
    97103      <DependentUpon>ExpressionSelectionView.cs</DependentUpon>
    98104    </Compile>
     105    <None Include="Plugin.cs.frame" />
     106    <Compile Include="Plugin.cs" />
    99107    <Compile Include="Properties\AssemblyInfo.cs" />
    100108    <Compile Include="PushDebuggerView.cs">
    … …  
    136144  </ItemGroup>
    137145  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     146  <PropertyGroup>
     147    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     148set ProjectDir=$(ProjectDir)
     149set SolutionDir=$(SolutionDir)
     150set Outdir=$(Outdir)
     151
     152call PreBuildEvent.cmd
     153</PreBuildEvent>
     154  </PropertyGroup>
    138155</Project>

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/HeuristicLab.Problems.ProgramSynthesis.csproj

    r15771 r15780  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.Problems.ProgramSynthesis</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.ProgramSynthesis</AssemblyName>
     11    <AssemblyName>HeuristicLab.Problems.ProgramSynthesis-3.3</AssemblyName>
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    … …  
    5252      <HintPath>..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
    5353    </Reference>
    54     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    55       <SpecificVersion>False</SpecificVersion>
    56       <HintPath>..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    57     </Reference>
    5854    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5955      <SpecificVersion>False</SpecificVersion>
    … …  
    6359      <SpecificVersion>False</SpecificVersion>
    6460      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
    65     </Reference>
    66     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    67       <SpecificVersion>False</SpecificVersion>
    68       <HintPath>..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    69     </Reference>
    70     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    71       <SpecificVersion>False</SpecificVersion>
    72       <HintPath>..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    7361    </Reference>
    7462    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    … …  
    121109  </ItemGroup>
    122110  <ItemGroup>
     111    <None Include="Plugin.cs.frame" />
    123112    <Compile Include="Plugin.cs" />
    124113    <Compile Include="Properties\Resources.Designer.cs">
    … …  
    177166    <Compile Include="Push\BenchmarkSuite\ExampleArgumentType.cs" />
    178167    <Compile Include="Push\BenchmarkSuite\IBenchmarkSuiteDataDescriptor.cs" />
    179     <Compile Include="Push\BenchmarkSuite\Plugin.cs" />
    180168    <Compile Include="Push\BenchmarkSuite\ProblemData.cs" />
    181169    <Compile Include="Push\BenchmarkSuite\Problems\Checksum.cs" />
    … …  
    358346    </PostBuildEvent>
    359347  </PropertyGroup>
     348  <PropertyGroup>
     349    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     350set ProjectDir=$(ProjectDir)
     351set SolutionDir=$(SolutionDir)
     352set Outdir=$(Outdir)
     353
     354call PreBuildEvent.cmd
     355</PreBuildEvent>
     356  </PropertyGroup>
    360357  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    361358       Other similar extension points exist, see Microsoft.Common.targets.

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs

    r15771 r15780  
    99
    1010  public abstract class BenchmarkSuiteDataDescriptor : IBenchmarkSuiteDataDescriptor {
    11     private const string InstanceArchiveName = "HeuristicLab.BenchmarkSuite.Data.BenchmarkExamples.zip";
     11    private const string InstanceArchiveName = "HeuristicLab.Problems.ProgramSynthesis.Push.BenchmarkSuite.Data.BenchmarkExamples.zip";
    1212    private const string ResourcePath = @".*\.Data\.";
    1313    private const char ExampleFieldDelimiter = ',';

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r15771 r15780  
    88    <AppDesignerFolder>Properties</AppDesignerFolder>
    99    <RootNamespace>HeuristicLab.Tests</RootNamespace>
    10     <AssemblyName>F</AssemblyName>
     10    <AssemblyName>HeuristicLab.Problems.ProgramSynthesis.Tests-3.3</AssemblyName>
    1111    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1212    <FileAlignment>512</FileAlignment>

  • branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Tests/HeuristicLab.Tests.csproj.user

    r14875 r15780  
    22<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    4     <ProjectView>ProjectFiles</ProjectView>
     4    <ProjectView>ShowAllFiles</ProjectView>
    55  </PropertyGroup>
    66</Project>
Note: See TracChangeset for help on using the changeset viewer.