Context Navigation

← Previous Change
Next Change →

Changeset 15281 for branches/Async/HeuristicLab.Services.OKB.DataAccess

Timestamp:

07/23/17 11:17:18 (8 years ago)

Author:

abeham

Message:

#2258: merged r14001:15280 from trunk into branch

Location:

Files:

: 7 edited

. (modified) (2 props)
HeuristicLab.Services.OKB.DataAccess/3.3/CharacteristicType.cs (modified) (1 diff)
HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml (modified) (1 diff)
HeuristicLab.Services.OKB.DataAccess/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameCategory.cs (modified) (1 diff)
HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameType.cs (modified) (1 diff)
HeuristicLab.Services.OKB.DataAccess/3.3/app.config (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/Async

Property svn:ignore

old	new
24	24	protoc.exe
25	25	obj
	26	.vs

Property svn:mergeinfo changed

/branches/symbreg-factors-2650 (added)	merged: 14232-14233,14237-14243,14248-14249,14251,14259,14266,14276-14277,14330-14331,14339,14351,14399,14401-14403,14421,14449,14497-14499,14501-14502,14534-14535,14539-14542,14554,14560,14589,14591-14592,14615,14693,14701,14715-14717,14719-14720,14751-14756,14758-14766,14812-14815,14823-14825
/stable	merged: 14190
/trunk/sources	merged: 14001,14007-14008,14011,14015-14017,14024-14026,14032,14034,14036-14037,14056-14057,14071,14078,14082-14083,14094-14096,14098-14100,14102-14103,14106-14107,14109-14110,14118,14120-14122,14124-14127,14129-14132,14135-14137,14140,14142,14144,14150,14152,14155-14160,14162-14164,14167-14169,14171,14174-14175,14177-14179,14181,14185,14187,14189,14191,14195-14196,14198,14200,14202-14209,14221-14224,14226-14230,14234-14236,14244-14247,14250,14255-14258,14260,14267-14268,14270-14273,14282,14284-14300,14307,14314-14316,14319,14322,14332,14340-14350,14352-14358,14367-14369,14371-14372,14376,14378,14381-14382,14384,14388,14390-14391,14393-14394,14396,14400,14405,14407-14408,14412,14418,14422-14423,14425,14432-14439,14443,14457-14458,14463-14465,14468-14469,14475-14476,14478-14479,14481-14483,14486,14493-14494,14504,14506-14509,14516-14517,14519,14522-14523,14527-14529,14531-14533,14548,14553,14561,14582,14597,14623,14630,14636-14638,14640-14641,14647,14651-14652,14654,14656,14659-14660,14662-14663,14672,14685,14687,14692,14697,14706,14708-14709,14718,14721-14722,14726,14732,14734,14737-14738,14740,14748-14750,14769-14770,14772-14775,14779-14781,14786,14789-14791,14793,14805,14809-14810,14817,14819-14820,14826-14832,14839-14843,14845-14847,14851-14854,14857,14860-14865,14871,14877,14882,14886,14889-14890,14899,14901,14904,14911-14912,14916,14918,14936-14938,14943-14951,14955,14971,14978-14979,14982,14984,14987,14992,14995,15002-15010,15013,15015-15016,15023-15024,15026,15029,15040,15042,15044,15046-15054,15058,15067-15077,15079-15080,15083-15088,15091-15096,15098-15099,15102-15107,15110-15114,15119-15126,15129,15135,15139,15156-15158,15160,15162-15169,15172-15173,15178-15181,15184-15185,15187,15191-15192,15194,15198,15201,15203,15205-15211,15213-15214,15221-15228,15230,15233-15236,15240-15241,15246-15248,15264-15266,15271,15276

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/CharacteristicType.cs

r15280	r15281
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml

r15280	r15281
1	1	<?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.OKB" EntityNamespace="HeuristicLab.Services.OKB.DataAccess" ContextNamespace="HeuristicLab.Services.OKB.DataAccess" Class="OKBDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
2		<Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;In~~itial Catalog=HeuristicLab.OKB;Integrated Security=True~~" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" />
	2	<Connection Mode="AppSettings" ConnectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" />
3	3	<Table Name="dbo.AlgorithmClass" Member="AlgorithmClasses">
4	4	<Type Name="AlgorithmClass">

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

-                      r13321
+                      r15281
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameCategory.cs

r12012	r15281
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameType.cs

r12012	r15281
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Async/HeuristicLab.Services.OKB.DataAccess/3.3/app.config

-                      r11623
+                      r15281
 <?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-  </configSections>
   <connectionStrings>
     <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" providerName="System.Data.SqlClient"/>
+    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" />
   </connectionStrings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+  </startup>
+</configuration>

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Update cookies preferences