Changeset 16857


Ignore:
Timestamp:
04/19/19 16:52:37 (4 months ago)
Author:
dpiringe
Message:

#2924: separated PasswordDialog from HeuristicLab.Clients.Common into new Project called HeuristicLab.PasswordDialog and migrated HeuristicLab.Clients.Common to .NET Standard

Location:
branches/2924_DotNetCoreMigration
Files:
6 added
1 deleted
5 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/2924_DotNetCoreMigration/HeuristicLab 3.3.sln

    r16147 r16857  
    254254Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.WindowsForms-3.3", "HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj", "{AB687BBE-1BFE-476B-906D-44237135431D}"
    255255EndProject
    256 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Common-3.3", "HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj", "{730A9104-D4D1-4360-966B-E49B7571DDA3}"
     256Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeuristicLab.Clients.Common-3.3", "HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj", "{730A9104-D4D1-4360-966B-E49B7571DDA3}"
    257257EndProject
    258258Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Visualization.ChartControlsExtensions-3.3", "HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj", "{315BDA09-3F4F-49B3-9790-B37CFC1C5750}"
     
    464464EndProject
    465465Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure.UI-4.0", "HeuristicLab.PluginInfrastructure.UI\HeuristicLab.PluginInfrastructure.UI-4.0.csproj", "{7AF3C7B6-8BA5-44F3-8D5B-2BF7A23CF12D}"
     466EndProject
     467Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PasswordDialog", "HeuristicLab.PasswordDialog\3.4\HeuristicLab.PasswordDialog-3.4.csproj", "{632E2C03-FA6F-4540-8AF0-6B4D60F99F26}"
    466468EndProject
    467469Global
  • branches/2924_DotNetCoreMigration/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj

    r16147 r16857  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project Sdk="Microsoft.NET.Sdk">
    33  <PropertyGroup>
    4     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    5     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>8.0.30703</ProductVersion>
    7     <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{730A9104-D4D1-4360-966B-E49B7571DDA3}</ProjectGuid>
    9     <OutputType>Library</OutputType>
    10     <AppDesignerFolder>Properties</AppDesignerFolder>
     4    <TargetFramework>netstandard2.0</TargetFramework>
     5    <Copyright>(c) 2002-2018 HEAL</Copyright>
     6    <Product>HeuristicLab</Product>
     7    <SignAssembly>true</SignAssembly>
     8    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     9    <AssemblyVersion>3.3.0.0</AssemblyVersion>
     10    <AssemblyFileVersion>3.3.15.0</AssemblyFileVersion>
    1111    <RootNamespace>HeuristicLab.Clients.Common</RootNamespace>
    12     <AssemblyName>HeuristicLab.Clients.Common-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    14     <TargetFrameworkProfile>
    15     </TargetFrameworkProfile>
    16     <FileAlignment>512</FileAlignment>
    17     <TargetFrameworkProfile />
    1812  </PropertyGroup>
    19   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    20     <DebugSymbols>true</DebugSymbols>
    21     <DebugType>full</DebugType>
    22     <Optimize>false</Optimize>
    23     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    24     <DefineConstants>DEBUG;TRACE</DefineConstants>
    25     <ErrorReport>prompt</ErrorReport>
    26     <WarningLevel>4</WarningLevel>
    27     <Prefer32Bit>false</Prefer32Bit>
    28   </PropertyGroup>
    29   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    30     <DebugType>pdbonly</DebugType>
    31     <Optimize>true</Optimize>
    32     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    33     <DefineConstants>TRACE</DefineConstants>
    34     <ErrorReport>prompt</ErrorReport>
    35     <WarningLevel>4</WarningLevel>
    36     <Prefer32Bit>false</Prefer32Bit>
    37   </PropertyGroup>
    38   <PropertyGroup>
    39     <SignAssembly>true</SignAssembly>
    40   </PropertyGroup>
    41   <PropertyGroup>
    42     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    43   </PropertyGroup>
    44   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    45     <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    47     <DefineConstants>DEBUG;TRACE</DefineConstants>
    48     <DebugType>full</DebugType>
    49     <PlatformTarget>x64</PlatformTarget>
    50     <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    51     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    52     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    53     <ErrorReport>prompt</ErrorReport>
    54     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    55     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    56     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    57     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    58     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    59     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
    60     <Prefer32Bit>false</Prefer32Bit>
    61   </PropertyGroup>
    62   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    63     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    64     <DefineConstants>TRACE</DefineConstants>
    65     <Optimize>true</Optimize>
    66     <DebugType>pdbonly</DebugType>
    67     <PlatformTarget>x64</PlatformTarget>
    68     <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    69     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    70     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    71     <ErrorReport>prompt</ErrorReport>
    72     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    73     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    74     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    75     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    76     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    77     <Prefer32Bit>false</Prefer32Bit>
    78   </PropertyGroup>
    79   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    80     <DebugSymbols>true</DebugSymbols>
    81     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    82     <DefineConstants>DEBUG;TRACE</DefineConstants>
    83     <DebugType>full</DebugType>
    84     <PlatformTarget>x86</PlatformTarget>
    85     <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    86     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    87     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    88     <ErrorReport>prompt</ErrorReport>
    89     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    90     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    91     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    92     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    93     <Prefer32Bit>false</Prefer32Bit>
    94   </PropertyGroup>
    95   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    96     <OutputPath>$(SolutionDir)\bin\</OutputPath>
    97     <DefineConstants>TRACE</DefineConstants>
    98     <Optimize>true</Optimize>
    99     <DebugType>pdbonly</DebugType>
    100     <PlatformTarget>x86</PlatformTarget>
    101     <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    102     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    103     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    104     <ErrorReport>prompt</ErrorReport>
    105     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    106     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    107     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    108     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    109     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    110     <Prefer32Bit>false</Prefer32Bit>
     13  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     14    <Exec Command="set Path=%Path%;$(ProjectDir);$(SolutionDir)&#xD;&#xA;set ProjectDir=$(ProjectDir)&#xD;&#xA;set SolutionDir=$(SolutionDir)&#xD;&#xA;set Outdir=$(Outdir)&#xD;&#xA;call PreBuildEvent.cmd" />
     15  </Target>
     16  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     17    <OutputPath>..\..\bin\</OutputPath>
     18    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    11119  </PropertyGroup>
    11220  <ItemGroup>
    113     <Reference Include="Microsoft.Win32.Registry, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    114       <HintPath>..\..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
    115     </Reference>
    116     <Reference Include="Microsoft.Win32.Registry.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    117       <HintPath>..\..\packages\Microsoft.Win32.Registry.AccessControl.4.5.0\lib\net461\Microsoft.Win32.Registry.AccessControl.dll</HintPath>
    118     </Reference>
    119     <Reference Include="Microsoft.Win32.SystemEvents, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    120       <HintPath>..\..\packages\Microsoft.Win32.SystemEvents.4.5.0\lib\net461\Microsoft.Win32.SystemEvents.dll</HintPath>
    121     </Reference>
    122     <Reference Include="System" />
    123     <Reference Include="System.CodeDom, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    124       <HintPath>..\..\packages\System.CodeDom.4.5.0\lib\net461\System.CodeDom.dll</HintPath>
    125     </Reference>
    126     <Reference Include="System.ComponentModel.Composition" />
    127     <Reference Include="System.Configuration" />
    128     <Reference Include="System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    129       <HintPath>..\..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
    130     </Reference>
    131     <Reference Include="System.Core" />
    132     <Reference Include="System.Data.Odbc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    133       <HintPath>..\..\packages\System.Data.Odbc.4.5.0\lib\net461\System.Data.Odbc.dll</HintPath>
    134     </Reference>
    135     <Reference Include="System.Data.OracleClient" />
    136     <Reference Include="System.Data.SqlClient, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    137       <HintPath>..\..\packages\System.Data.SqlClient.4.5.0\lib\net461\System.Data.SqlClient.dll</HintPath>
    138     </Reference>
    139     <Reference Include="System.Diagnostics.EventLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    140       <HintPath>..\..\packages\System.Diagnostics.EventLog.4.5.0\lib\net461\System.Diagnostics.EventLog.dll</HintPath>
    141     </Reference>
    142     <Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    143       <HintPath>..\..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
    144     </Reference>
    145     <Reference Include="System.DirectoryServices" />
    146     <Reference Include="System.DirectoryServices.AccountManagement" />
    147     <Reference Include="System.DirectoryServices.Protocols" />
    148     <Reference Include="System.Drawing" />
    149     <Reference Include="System.Drawing.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    150       <HintPath>..\..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll</HintPath>
    151     </Reference>
    152     <Reference Include="System.IdentityModel" />
    153     <Reference Include="System.IO.FileSystem.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    154       <HintPath>..\..\packages\System.IO.FileSystem.AccessControl.4.5.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
    155     </Reference>
    156     <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    157       <HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
    158     </Reference>
    159     <Reference Include="System.IO.Packaging, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    160       <HintPath>..\..\packages\System.IO.Packaging.4.5.0\lib\net46\System.IO.Packaging.dll</HintPath>
    161     </Reference>
    162     <Reference Include="System.IO.Pipes.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    163       <HintPath>..\..\packages\System.IO.Pipes.AccessControl.4.5.0\lib\net461\System.IO.Pipes.AccessControl.dll</HintPath>
    164     </Reference>
    165     <Reference Include="System.IO.Ports, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    166       <HintPath>..\..\packages\System.IO.Ports.4.5.0\lib\net461\System.IO.Ports.dll</HintPath>
    167     </Reference>
    168     <Reference Include="System.Management" />
    169     <Reference Include="System.Net" />
    170     <Reference Include="System.Runtime.Caching" />
    171     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    172       <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    173     </Reference>
    174     <Reference Include="System.Runtime.Serialization" />
    175     <Reference Include="System.Security" />
    176     <Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    177       <HintPath>..\..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
    178     </Reference>
    179     <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    180       <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.0\lib\net47\System.Security.Cryptography.Cng.dll</HintPath>
    181     </Reference>
    182     <Reference Include="System.Security.Cryptography.Pkcs, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    183       <HintPath>..\..\packages\System.Security.Cryptography.Pkcs.4.5.0\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
    184     </Reference>
    185     <Reference Include="System.Security.Cryptography.ProtectedData, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    186       <HintPath>..\..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll</HintPath>
    187     </Reference>
    188     <Reference Include="System.Security.Cryptography.Xml, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    189       <HintPath>..\..\packages\System.Security.Cryptography.Xml.4.5.0\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
    190     </Reference>
    191     <Reference Include="System.Security.Permissions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    192       <HintPath>..\..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll</HintPath>
    193     </Reference>
    194     <Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    195       <HintPath>..\..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
    196     </Reference>
    197     <Reference Include="System.ServiceModel" />
    198     <Reference Include="System.ServiceModel.Duplex, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    199       <HintPath>..\..\packages\System.ServiceModel.Duplex.4.4.1\lib\net461\System.ServiceModel.Duplex.dll</HintPath>
    200     </Reference>
    201     <Reference Include="System.ServiceModel.Http, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    202       <HintPath>..\..\packages\System.ServiceModel.Http.4.4.1\lib\net461\System.ServiceModel.Http.dll</HintPath>
    203     </Reference>
    204     <Reference Include="System.ServiceModel.NetTcp, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    205       <HintPath>..\..\packages\System.ServiceModel.NetTcp.4.4.1\lib\net461\System.ServiceModel.NetTcp.dll</HintPath>
    206     </Reference>
    207     <Reference Include="System.ServiceModel.Primitives, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    208       <HintPath>..\..\packages\System.ServiceModel.Primitives.4.4.1\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
    209     </Reference>
    210     <Reference Include="System.ServiceModel.Syndication, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    211       <HintPath>..\..\packages\System.ServiceModel.Syndication.4.5.0\lib\net461\System.ServiceModel.Syndication.dll</HintPath>
    212     </Reference>
    213     <Reference Include="System.ServiceProcess" />
    214     <Reference Include="System.ServiceProcess.ServiceController, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    215       <HintPath>..\..\packages\System.ServiceProcess.ServiceController.4.5.0\lib\net461\System.ServiceProcess.ServiceController.dll</HintPath>
    216     </Reference>
    217     <Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    218       <HintPath>..\..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
    219     </Reference>
    220     <Reference Include="System.Threading.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
    221       <HintPath>..\..\packages\System.Threading.AccessControl.4.5.0\lib\net461\System.Threading.AccessControl.dll</HintPath>
    222     </Reference>
    223     <Reference Include="System.Transactions" />
    224     <Reference Include="System.Windows.Forms" />
    225     <Reference Include="System.Xml.Linq" />
    226     <Reference Include="System.Data.DataSetExtensions" />
    227     <Reference Include="System.Data" />
    228     <Reference Include="System.Xml" />
    229     <Reference Include="WindowsBase" />
     21    <PackageReference Include="System.ServiceModel.Primitives" Version="4.5.3" />
    23022  </ItemGroup>
    23123  <ItemGroup>
    232     <Compile Include="ClientFactory.cs" />
    233     <Compile Include="CryptoService.cs" />
    234     <Compile Include="PasswordDialog.cs">
    235       <SubType>Form</SubType>
    236     </Compile>
    237     <Compile Include="PasswordDialog.Designer.cs">
    238       <DependentUpon>PasswordDialog.cs</DependentUpon>
    239     </Compile>
    240     <Compile Include="Plugin.cs" />
    241     <Compile Include="Properties\AssemblyInfo.cs" />
    242     <Compile Include="Properties\Settings.Designer.cs">
    243       <AutoGen>True</AutoGen>
    244       <DesignTimeSharedInput>True</DesignTimeSharedInput>
    245       <DependentUpon>Settings.settings</DependentUpon>
    246     </Compile>
    247     <None Include="app.config" />
    248     <None Include="packages.config" />
    249     <None Include="Properties\AssemblyInfo.cs.frame" />
    250     <None Include="Properties\Settings.settings">
    251       <Generator>PublicSettingsSingleFileGenerator</Generator>
    252       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     24    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj" />
     25  </ItemGroup>
     26  <ItemGroup>
     27    <None Update="Properties\Settings.settings">
     28      <Generator>SettingsSingleFileGenerator</Generator>
    25329    </None>
    25430  </ItemGroup>
    255   <ItemGroup>
    256     <None Include="HeuristicLab.snk" />
    257     <None Include="Plugin.cs.frame" />
    258   </ItemGroup>
    259   <ItemGroup>
    260     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    261       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    262       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    263       <Private>False</Private>
    264     </ProjectReference>
    265   </ItemGroup>
    266   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    267   <PropertyGroup>
    268     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    269 set ProjectDir=$(ProjectDir)
    270 set SolutionDir=$(SolutionDir)
    271 set Outdir=$(Outdir)
    272 
    273 call PreBuildEvent.cmd
    274 </PreBuildEvent>
    275     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    276 export ProjectDir=$(ProjectDir)
    277 export SolutionDir=$(SolutionDir)
    278 
    279 $SolutionDir/PreBuildEvent.sh
    280 </PreBuildEvent>
    281   </PropertyGroup>
    282   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    283        Other similar extension points exist, see Microsoft.Common.targets.
    284   <Target Name="BeforeBuild">
    285   </Target>
    286   <Target Name="AfterBuild">
    287   </Target>
    288   -->
    28931</Project>
  • branches/2924_DotNetCoreMigration/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r16147 r16857  
    329329      <Private>False</Private>
    330330    </ProjectReference>
     331    <ProjectReference Include="..\..\HeuristicLab.PasswordDialog\3.4\HeuristicLab.PasswordDialog-3.4.csproj">
     332      <Project>{632e2c03-fa6f-4540-8af0-6b4d60f99f26}</Project>
     333      <Name>HeuristicLab.PasswordDialog</Name>
     334    </ProjectReference>
    331335    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    332336      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     
    393397      <Version>4.5.0</Version>
    394398    </PackageReference>
    395     <PackageReference Include="Microsoft.Windows.Compatibility">
    396       <Version>2.0.1</Version>
    397     </PackageReference>
    398399    <PackageReference Include="System.CodeDom">
    399400      <Version>4.5.0</Version>
     
    412413    </PackageReference>
    413414    <PackageReference Include="System.Data.SqlClient">
    414       <Version>4.5.0</Version>
     415      <Version>4.6.0</Version>
    415416    </PackageReference>
    416417    <PackageReference Include="System.Diagnostics.EventLog">
     
    430431    </PackageReference>
    431432    <PackageReference Include="System.Drawing.Common">
    432       <Version>4.5.0</Version>
     433      <Version>4.5.1</Version>
    433434    </PackageReference>
    434435    <PackageReference Include="System.IO.FileSystem.AccessControl">
     
    442443    </PackageReference>
    443444    <PackageReference Include="System.IO.Pipes.AccessControl">
    444       <Version>4.5.0</Version>
     445      <Version>4.5.1</Version>
    445446    </PackageReference>
    446447    <PackageReference Include="System.IO.Ports">
     
    454455    </PackageReference>
    455456    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
    456       <Version>4.5.0</Version>
     457      <Version>4.5.2</Version>
    457458    </PackageReference>
    458459    <PackageReference Include="System.Security.AccessControl">
     
    463464    </PackageReference>
    464465    <PackageReference Include="System.Security.Cryptography.Pkcs">
    465       <Version>4.5.0</Version>
     466      <Version>4.5.2</Version>
    466467    </PackageReference>
    467468    <PackageReference Include="System.Security.Cryptography.ProtectedData">
     
    475476    </PackageReference>
    476477    <PackageReference Include="System.Security.Principal.Windows">
    477       <Version>4.5.0</Version>
    478     </PackageReference>
    479     <PackageReference Include="System.ServiceModel.Duplex">
    480       <Version>4.4.1</Version>
    481     </PackageReference>
    482     <PackageReference Include="System.ServiceModel.Http">
    483       <Version>4.4.1</Version>
    484     </PackageReference>
    485     <PackageReference Include="System.ServiceModel.NetTcp">
    486       <Version>4.4.1</Version>
    487     </PackageReference>
    488     <PackageReference Include="System.ServiceModel.Primitives">
    489       <Version>4.4.1</Version>
    490     </PackageReference>
    491     <PackageReference Include="System.ServiceModel.Security">
    492       <Version>4.4.1</Version>
    493     </PackageReference>
    494     <PackageReference Include="System.ServiceModel.Syndication">
    495       <Version>4.5.0</Version>
    496     </PackageReference>
    497     <PackageReference Include="System.ServiceProcess.ServiceController">
    498       <Version>4.5.0</Version>
     478      <Version>4.5.1</Version>
    499479    </PackageReference>
    500480    <PackageReference Include="System.Text.Encoding.CodePages">
    501       <Version>4.5.0</Version>
     481      <Version>4.5.1</Version>
    502482    </PackageReference>
    503483    <PackageReference Include="System.Threading.AccessControl">
  • branches/2924_DotNetCoreMigration/HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs

    r15973 r16857  
    2222using System.Collections.Generic;
    2323using System.Windows.Forms;
    24 using HeuristicLab.Clients.Common;
     24using HeuristicLab.PasswordDialog;
    2525using HeuristicLab.MainForm;
    2626
     
    4141
    4242    public override void Execute() {
    43       using (PasswordDialog dialog = new PasswordDialog()) {
     43      using (PasswordDialog.PasswordDialog dialog = new PasswordDialog.PasswordDialog()) {
    4444        dialog.ShowDialog((IWin32Window)MainFormManager.MainForm);
    4545      }
  • branches/2924_DotNetCoreMigration/HeuristicLab.PluginInfrastructure/3.3/PluginDescriptionIterator.cs

    r15973 r16857  
    2424
    2525namespace HeuristicLab.PluginInfrastructure {
    26   internal static class PluginDescriptionIterator {
    27     internal static IEnumerable<PluginDescription> IterateDependenciesBottomUp(IEnumerable<PluginDescription> pluginDescriptions) {
     26  public static class PluginDescriptionIterator {
     27    public static IEnumerable<PluginDescription> IterateDependenciesBottomUp(IEnumerable<PluginDescription> pluginDescriptions) {
    2828      // list to make sure we yield each description only once
    2929      HashSet<PluginDescription> yieldedDescriptions = new HashSet<PluginDescription>();
     
    4242    }
    4343
    44     internal static IEnumerable<PluginDescription> IterateDependentsTopDown(IEnumerable<PluginDescription> pluginDescriptions, IEnumerable<PluginDescription> allPlugins) {
     44    public static IEnumerable<PluginDescription> IterateDependentsTopDown(IEnumerable<PluginDescription> pluginDescriptions, IEnumerable<PluginDescription> allPlugins) {
    4545      HashSet<PluginDescription> yieldedDescriptions = new HashSet<PluginDescription>();
    4646      foreach (var desc in pluginDescriptions) {
Note: See TracChangeset for help on using the changeset viewer.