Improved MemoryBlockStream.SetLength() and added override for CanTimeout

--- MimeKit/IO/MemoryBlockStream.cs
+++ MimeKit/IO/MemoryBlockStream.cs
@@ -112,6 +112,16 @@
 		/// </value>
 		public override bool CanSeek {
 			get { return true; }
+		}
+
+		/// <summary>
+		/// Checks whether or not reading and writing to the stream can timeout.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if reading and writing to the stream can timeout; otherwise, <c>false</c>.
+		/// </value>
+		public override bool CanTimeout {
+			get { return false; }
 		}

 		/// <summary>
@@ -345,12 +355,27 @@

 			long capacity = blocks.Count * BlockSize;

-			while (capacity < value) {
-				blocks.Add (new byte[BlockSize]);
-				capacity += BlockSize;
-			}
-
-			position = Math.Min (position, length);
+			if (value > capacity) {
+				do {
+					blocks.Add (new byte[BlockSize]);
+					capacity += BlockSize;
+				} while (capacity < value);
+			} else if (value < length) {
+				// shed any blocks that are no longer needed
+				while (capacity - value > BlockSize) {
+					blocks.RemoveAt (blocks.Count - 1);
+					capacity -= BlockSize;
+				}
+
+				// reset the range of bytes bwteen the new length and the old length to 0
+				int count = (int) (Math.Min (length, capacity) - value);
+				int startIndex = (int) (position % BlockSize);
+				int block = (int) (position / BlockSize);
+
+				Array.Clear (blocks[block], startIndex, count);
+			}
+
+			position = Math.Min (position, value);
 			length = value;
 		}


Fixed TnefPropertyTag.IsNamed to always return true

--- MimeKit/Tnef/TnefPropertyTag.cs
+++ MimeKit/Tnef/TnefPropertyTag.cs
@@ -5496,7 +5496,7 @@
 		/// </remarks>
 		/// <value><c>true</c> if the property has a special name; otherwise, <c>false</c>.</value>
 		public bool IsNamed {
-			get { return Enum.IsDefined (typeof (TnefPropertyId), id); }
+			get { return true; }
 		}

 		/// <summary>


noggen datetime fixes

noggen datetime fixes

--- Modules/Wow/WowAdminCommands.cs
+++ Modules/Wow/WowAdminCommands.cs
@@ -188,9 +188,13 @@
                     {
                         var curMemberStats = new WowStats();
                         var match = statsFromDb.Where(s => s.CharName == member.character.name).FirstOrDefault();
-                        var matchTime = match.LastModified;
-
-                        if (match == null | matchTime.Day != DateTime.Now.Second)
+                        var matchTime = DateTime.Now;
+
+                        if (match != null)
+                        {
+                            matchTime = match.LastModified;
+                        }
+                        if (match == null || matchTime.Day != DateTime.Now.Day)
                         {
                             curMemberStats = _wowApi.GetCharStats(member.character.name, member.character.realm, guildObject.locale);
                             var elixer = curMemberStats.Statistics.SubCategories[0].SubCategories[0].Statistics.Where(s => s.Name == "Elixir consumed most").FirstOrDefault();


ViewsKey documentation

ViewsKey documentation

--- MonoCross.Navigation/Session.cs
+++ MonoCross.Navigation/Session.cs
@@ -36,20 +36,22 @@
         }

         /// <summary>
-        /// The key used for the container object.
+        /// The key used to keep the <see cref="MXContainer"/> instance in session.
         /// </summary>
         public const string ContainerKey = "theContainer";

         /// <summary>
-        /// The key used for the navigation map object.
+        /// The key used to keep the <see cref="NavigationList"/> instance in session.
         /// </summary>
         public const string NavKey = "navMap";

+        /// <summary>
+        /// The key used to keep the <see cref="MXViewMap"/> instance in session.
+        /// </summary>
         public const string ViewsKey = "Views";

-
         /// <summary>
-        /// Removes all keys and values from the <see cref="SessionDictionary"/> with the except of the application and navigation map objects.
+        /// Removes all keys and values from the <see cref="SessionDictionary"/> with the exception of the application and navigation map objects.
         /// </summary>
         public override void Clear()
         {


Pull bfgminer updates from Latest since we rely on 3.7

--- MultiMiner.Xgminer/Installer.cs
+++ MultiMiner.Xgminer/Installer.cs
@@ -102,7 +102,7 @@
         private static string GetBfgminerWindowsDownloadUrl()
         {
             string downloadRoot = GetMinerDownloadRoot();
-            const string downloadPath = "/programs/bitcoin/files/bfgminer/testing/";
+            const string downloadPath = "/programs/bitcoin/files/bfgminer/latest/";
             string availableDownloadsHtml = new WebClient().DownloadString(String.Format("{0}{1}", downloadRoot, downloadPath));
             const string pattern = @".*<a href=""(bfgminer-.+?-win32.zip)";
             Match match = Regex.Match(availableDownloadsHtml, pattern);


Try to investigate remote build failure

Try to investigate remote build failure

--- NBi.Services/TemplateManager.cs
+++ NBi.Services/TemplateManager.cs
@@ -58,8 +58,10 @@
         public string GetEmbeddedTemplate(string resourceName)
         {
             var value = string.Empty;           //Template
-            using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(string.Format("{0}{1}.txt", TEMPLATE_DIRECTORY, resourceName)))
+            using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{TEMPLATE_DIRECTORY}{resourceName}.txt"))
             {
+                if (stream == null)
+                    throw new ArgumentOutOfRangeException($"{TEMPLATE_DIRECTORY}{resourceName}.txt");
                 using (var reader = new StreamReader(stream))
                 {
                     value = reader.ReadToEnd();


Make Slighty faster test

Make Slighty faster test

--- NBitcoin.Tests/ProtocolTests.cs
+++ NBitcoin.Tests/ProtocolTests.cs
@@ -334,7 +334,7 @@
 			using(var builder = NodeBuilder.Create())
 			{
 				var node = builder.CreateNode(true).CreateNodeClient();
-				builder.Nodes[0].Generate(600);
+				builder.Nodes[0].CreateRPCClient().Generate(600);
 				var rpc = builder.Nodes[0].CreateRPCClient();
 				var chain = node.GetChain(rpc.GetBlockHash(500));
 				Assert.True(chain.Height == 500);


Avoid constructing TextBufferCloneServiceFactory outside the MEF catalog

--- src/EditorFeatures/Text/Implementation/TextBufferFactoryService/TextBufferCloneServiceFactory.cs
+++ src/EditorFeatures/Text/Implementation/TextBufferFactoryService/TextBufferCloneServiceFactory.cs
@@ -4,7 +4,6 @@

 using System;
 using System.Composition;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -20,11 +19,9 @@

         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public TextBufferCloneServiceFactory(
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService)
+        public TextBufferCloneServiceFactory(ITextBufferCloneService textBufferCloneService)
         {
-            _singleton = new TextBufferCloneService((ITextBufferFactoryService3)textBufferFactoryService, contentTypeRegistryService);
+            _singleton = textBufferCloneService;
         }

         public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
@@ -38,7 +35,7 @@
             private readonly IContentType _unknownContentType;

             [ImportingConstructor]
-            [SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Incorrectly used in production code: https://github.com/dotnet/roslyn/issues/42839")]
+            [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
             public TextBufferCloneService(ITextBufferFactoryService3 textBufferFactoryService, IContentTypeRegistryService contentTypeRegistryService)
             {
                 _textBufferFactoryService = textBufferFactoryService;


Fix player ship jittering when inside black hole

--- Client/PlayerShip.cs
+++ Client/PlayerShip.cs
@@ -107,6 +107,8 @@
             bounding = 0f;
             layer = CollisionLayer.None;
             layermask = CollisionLayer.None;
+            // all the stuff changed
+            changed |= ObjectProperty.Health | ObjectProperty.Layer | ObjectProperty.Throttle | ObjectProperty.Bounding;
             // fancy display
             Assets.GetSound("ExplosionMedium").Play3D(world.GetPlayerShip().position, position);
             NetServer.PublishParticleEffect(ParticleEffect.Explosion, position);


OpenUser_Main is now public. Fixes Mantis #2940. Thanks SirKimba

--- OpenSim/Grid/UserServer/Main.cs
+++ OpenSim/Grid/UserServer/Main.cs
@@ -71,7 +71,7 @@
             userserver.Work();
         }

-        protected OpenUser_Main()
+        public OpenUser_Main()
         {
             m_console = new ConsoleBase("User", this);
             MainConsole.Instance = m_console;


removing ActivityViewModelTests

removing ActivityViewModelTests

--- AllReadyApp/Web-App/AllReady.UnitTest/ViewModels/ActivityViewModelTests.cs
+++ AllReadyApp/Web-App/AllReady.UnitTest/ViewModels/ActivityViewModelTests.cs
@@ -1,36 +0,0 @@
-using AllReady.Models;
-using AllReady.ViewModels;
-using Xunit;
-
-namespace AllReady.UnitTest.ViewModels
-{
-    public class ActivityViewModelTests
-    {
-        [Fact]
-        public void NoArgumentConstructorInstantiatesTasks()
-        {
-            var sut = new ActivityViewModel();
-            Assert.NotNull(sut.Tasks);
-        }
-
-        [Fact]
-        public void ActivityArgumentConstructorSetsOrganizationNameAndOrganizaitonIdWhenCampaignAndCampaignsManagagingOrganizationIsNotNull()
-        {
-            var activity = new Activity { Campaign = new Campaign { ManagingOrganization = new Organization { Id = 1, Name = "OrganizationName" }}};
-            var sut = new ActivityViewModel(activity);
-
-            Assert.Equal(activity.Campaign.ManagingOrganization.Id, sut.OrganizationId);
-            Assert.Equal(activity.Campaign.ManagingOrganization.Name, sut.OrganizationName);
-        }
-
-        [Fact]
-        public void ActivityArgumentConstructorSetsCampainIdAndCampianNameWhenCampaingIsNotNull()
-        {
-            var activity = new Activity { Campaign = new Campaign { Id = 1, Name = "CampaignName", ManagingOrganization = new Organization() }};
-            var sut = new ActivityViewModel(activity);
-
-            Assert.Equal(activity.Campaign.Id, sut.CampaignId);
-            Assert.Equal(activity.Campaign.Name, sut.CampaignName);
-        }
-    }
-}


removed unused code

removed unused code

--- OutcastBot/Commands/Commands.cs
+++ OutcastBot/Commands/Commands.cs
@@ -138,42 +138,6 @@
             File.Delete(outputPath);
         }

-        //[Command("tag")]
-        //[Description("Creates a new command with the given key/value pair, or gets a command with the given tag")]
-        //[RequirePermissions(Permissions.ManageChannels)]
-        //public async Task Tag(CommandContext context, [Description("Tag name")]string key, [Description("Tag value"), RemainingText]string value = null)
-        //{
-        //    await context.TriggerTypingAsync();
-
-        //    using (var db = new TagContext())
-        //    {
-        //        var tag = db.Tags.FirstOrDefault(t => t.Key == key);
-
-        //        if (value == null)
-        //        {
-        //            if (tag == null)
-        //            {
-        //                await context.RespondAsync($"`{key}` is not a valid tag.");
-        //                return;
-        //            }
-        //            await context.RespondAsync(tag.Value);
-        //        }
-        //        else
-        //        {
-        //            if (tag != null)
-        //            {
-        //                await context.RespondAsync($"Tag `{key}` already exists.");
-        //                return;
-        //            }
-
-        //            tag = new Tag { Key = key, Value = value };
-        //            db.Add(tag);
-        //            await db.SaveChangesAsync();
-        //            await context.RespondAsync($"Created tag `{key}`");
-        //        }
-        //    }
-        //}
-
         [Hidden]
         [RequirePermissions(Permissions.ManageMessages)]
         [Command("emojis")]


Removed RevisionID.cs

Removed RevisionID.cs

--- blueprints/Datastructures/RevisionID.cs
+++ blueprints/Datastructures/RevisionID.cs
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Achim 'ahzf' Friedland <code@ahzf.de>
- * This file is part of Blueprints.NET
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#region Usings
-
-using System;
-
-#endregion
-
-namespace de.ahzf.blueprints.Datastructures
-{
-
-    /// <summary>
-    /// A RevisionId is an identificator for a specific IElement revision in
-    /// a distributed system consisting of a timestamp and a SystemId.
-    /// </summary>
-    public class RevisionId : IComparable, IComparable<RevisionId>, IEquatable<RevisionId>
-    {
-
-        #region Properties
-
-        #region Timestamp
-
-        /// <summary>
-        /// The timestamp of this revision.
-        /// </summary>
-        public UInt64 Timestamp { get; private set; }
-
-        #endregion
-
-        #region SystemId
-
-        /// <summary>
-        /// A unique identification of the generating system,
-        /// process or thread of this revision.
-        /// </summary>
-        public SystemId SystemId { get; private set; }
-
-        #endregion
-
-        #endregion
-
-        #region Constructors
-
-        #region RevisionId(mySystemId)
-
-        /// <summary>
-        /// Generates a RevisionId based on the actual timestamp and the given SystemId.
-        /// </summary>
-        /// <param name="mySystemId">An unique identificator for the generating system, process or thread</param>
-        public RevisionId(SystemId mySystemId)
-        {
-            Timestamp = (UInt64) UniqueTimestamp.Ticks;
-            SystemId  = mySystemId;
-        }
-
-        #endregion
-
-        #region RevisionId(myTimestamp, mySystemId)
-
-        /// <summary>
-        /// Generates a RevisionId based on the given UInt64 timestamp and the given SystemId.
-        /// </summary>
-        /// <param name="myTimestamp">A timestamp</param>
-        /// <param name="mySystemId">An unique identificator for the generating system, process or thread</param>
-        public RevisionId(UInt64 myTimestamp, SystemId mySystemId)
-        {
-            Timestamp = myTimestamp;
-            SystemId  = mySystemId;
-        }
-
-        #endregion
-
-        #region RevisionId(myDateTime, mySystemId)
-
-        /// <summary>
-        /// Generates a RevisionId based on the given DateTime object and the given SystemId.
-        /// </summary>
-        /// <param name="myDateTime">A DateTime object</param>
-        /// <param name="mySystemId">An unique identificator for the generating system, process or thread</param>
-        public RevisionId(DateTime myDateTime, SystemId mySystemId)
-        {
-            Timestamp = (UInt64) myDateTime.Ticks;
-            SystemId  = mySystemId;
-        }
-
-        #endregion
-
-        #region RevisionId(myDateTimeString, mySystemId)
-
-        /// <summary>
-        /// Generates a RevisionId based on the "yyyyddMM.HHmmss.fffffff" formated
-        /// string representation of a DateTime object and the given SystemId.
-        /// </summary>
-        /// <param name="myDateTimeString">A DateTime object as "yyyyddMM.HHmmss.fffffff"-formated string</param>
-        /// <param name="mySystemId">An unique identificator for the generating system, process or thread</param>
-        /// <exception cref="System.FormatException"></exception>
-        public RevisionId(String myDateTimeString, SystemId mySystemId)
-        {
-            try
-            {
-                Timestamp = (UInt64) (DateTime.ParseExact(myDateTimeString, "yyyyddMM.HHmmss.fffffff", null)).Ticks;
-                SystemId  = mySystemId;
-            }
-            catch
-            {
-                throw new FormatException("The given string could not be parsed!");
-            }
-        }
-
-        #endregion
-
-        #region RevisionId(myRevisionIdString)
-
-        /// <summary>
-        /// Generates a RevisionId based on the "yyyyddMM.HHmmss.fffffff(SystemId)"
-        /// formated string representation of a RevisionId.
-        /// </summary>
-        /// <param name="myRevisionIdString">A RevisionId object as "yyyyddMM.HHmmss.fffffff(SystemId)"-formated string</param>
-        /// <exception cref="System.FormatException"></exception>
-        public RevisionId(String myRevisionIdString)
-        {
-            try
-            {
-                var __Timestamp = myRevisionIdString.Remove(myRevisionIdString.IndexOf("("));
-                var __SystemId  = myRevisionIdString.Substring(__Timestamp.Length + 1, myRevisionIdString.Length - __Timestamp.Length - 2);
-
-                Timestamp       = (UInt64) (DateTime.ParseExact(__Timestamp, "yyyyddMM.HHmmss.fffffff", null)).Ticks;
-                SystemId        = new SystemId(__SystemId);
-            }
-            catch
-            {
-                throw new FormatException("The given string could not be parsed!");
-            }
-        }
-
-        #endregion
-
-        #endregion
-
-
-        #region Operator overloading
-
-        #region Operator == (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator == (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-
-            // If both are null, or both are same instance, return true.
-            if (Object.ReferenceEquals(myRevisionId1, myRevisionId2))
-                return true;
-
-            // If one is null, but not both, return false.
-            if (((Object) myRevisionId1 == null) || ((Object) myRevisionId2 == null))
-                return false;
-
-            return myRevisionId1.Equals(myRevisionId2);
-
-        }
-
-        #endregion
-
-        #region Operator != (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator != (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-            return !(myRevisionId1 == myRevisionId2);
-        }
-
-        #endregion
-
-        #region Operator <  (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator < (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-
-            if (myRevisionId1.Timestamp < myRevisionId2.Timestamp)
-                return true;
-
-            if (myRevisionId1.Timestamp > myRevisionId2.Timestamp)
-                return false;
-
-            // myRevisionId1.Timestamp == myRevisionId2.Timestamp
-            if (myRevisionId1.SystemId < myRevisionId2.SystemId)
-                return true;
-
-            return false;
-
-        }
-
-        #endregion
-
-        #region Operator >  (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator > (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-
-            if (myRevisionId1.Timestamp > myRevisionId2.Timestamp)
-                return true;
-
-            if (myRevisionId1.Timestamp < myRevisionId2.Timestamp)
-                return false;
-
-            // myRevisionId1.Timestamp == myRevisionId2.Timestamp
-            if (myRevisionId1.SystemId > myRevisionId2.SystemId)
-                return true;
-
-            return false;
-
-        }
-
-        #endregion
-
-        #region Operator <= (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator <= (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-            return !(myRevisionId1 > myRevisionId2);
-        }
-
-        #endregion
-
-        #region Operator >= (myRevisionId1, myRevisionId2)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId1">A RevisionId.</param>
-        /// <param name="myRevisionId2">Another RevisionId.</param>
-        /// <returns>true|false</returns>
-        public static Boolean operator >= (RevisionId myRevisionId1, RevisionId myRevisionId2)
-        {
-            return !(myRevisionId1 < myRevisionId2);
-        }
-
-        #endregion
-
-        #endregion
-
-        #region IComparable<RevisionId> Member
-
-        #region CompareTo(myObject)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myObject">An object to compare with.</param>
-        /// <returns>true|false</returns>
-        public Int32 CompareTo(Object myObject)
-        {
-
-            // Check if myObject is null
-            if (myObject == null)
-                throw new ArgumentNullException();
-
-            // If parameter cannot be cast to Point return false.
-            var _RevisionId = myObject as RevisionId;
-            if ((Object) _RevisionId == null)
-                throw new ArgumentException("myObject is not of type RevisionId!");
-
-            if (this < _RevisionId) return -1;
-            if (this > _RevisionId) return +1;
-
-            return 0;
-
-        }
-
-        #endregion
-
-        #region CompareTo(myRevisionId)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId">An object to compare with.</param>
-        /// <returns>true|false</returns>
-        public Int32 CompareTo(RevisionId myRevisionId)
-        {
-
-            // Check if myRevisionId is null
-            if (myRevisionId == null)
-                throw new ArgumentNullException();
-
-            if (this < myRevisionId) return -1;
-            if (this > myRevisionId) return +1;
-
-            return 0;
-
-        }
-
-        #endregion
-
-        #endregion
-
-        #region IEquatable<RevisionId> Members
-
-        #region Equals(myObject)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myObject">An object to compare with.</param>
-        /// <returns>true|false</returns>
-        public override Boolean Equals(Object myObject)
-        {
-
-            // Check if myObject is null
-            if (myObject == null)
-                return false;
-
-            // If parameter cannot be cast to RevisionId return false.
-            var _RevisionId = myObject as RevisionId;
-            if ((Object) _RevisionId == null)
-                return false;
-
-            return Equals(_RevisionId);
-
-        }
-
-        #endregion
-
-        #region Equals(myRevisionId)
-
-        /// <summary>
-        /// Compares two instances of this object.
-        /// </summary>
-        /// <param name="myRevisionId">An object to compare with.</param>
-        /// <returns>true|false</returns>
-        public Boolean Equals(RevisionId myRevisionId)
-        {
-
-            // If parameter is null return false:
-            if ((Object) myRevisionId == null)
-                return false;
-
-            // Check if the inner fields have the same values
-            if (Timestamp != myRevisionId.Timestamp)
-                return false;
-
-            if (SystemId != myRevisionId.SystemId)
-                return false;
-
-            return true;
-
-        }
-
-        #endregion
-
-        #endregion
-
-        #region GetHashCode()
-
-        /// <summary>
-        /// Return the HashCode of this object.
-        /// </summary>
-        /// <returns>The HashCode of this object.</returns>
-        public override Int32 GetHashCode()
-        {
-            return Timestamp.GetHashCode() ^ SystemId.GetHashCode();
-        }
-
-        #endregion
-
-        #region ToString()
-
-        /// <summary>
-        /// Returns a formated string representation of this revision
-        /// </summary>
-        /// <returns>A formated string representation of this revision</returns>
-        public override String ToString()
-        {
-            return String.Format("{0:yyyyddMM.HHmmss.fffffff}({1})", new DateTime((Int64) Timestamp), SystemId.ToString());
-        }
-
-        #endregion
-
-    }
-
-}


CR feedback

CR feedback

--- src/System.Web.Mvc/TemplateInfo.cs
+++ src/System.Web.Mvc/TemplateInfo.cs
@@ -52,7 +52,7 @@
             {
                 // See Codeplex #544 - the partialFieldName might represent an indexer access, in which case combining
                 // with a 'dot' would be invalid.
-                return HtmlFieldPrefix + (partialFieldName ?? String.Empty);
+                return HtmlFieldPrefix + partialFieldName;
             }
             else
             {


Repair ScriptPath

Repair ScriptPath

--- src/Tests/Peachpie.Test/Program.cs
+++ src/Tests/Peachpie.Test/Program.cs
@@ -6,7 +6,7 @@
 {
     class Program
     {
-        const string ScriptPath = "password_hash_004.php";
+        const string ScriptPath = "index.php";

         static void Main(string[] args)
         {


bumped version, stupidly started on 1 :/

--- scr/blazey.registry/Properties/AssemblyInfo.cs
+++ scr/blazey.registry/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]


EditTagIcon: fix update preview when using stock icons

Fix bgo#592713

--- src/UI.Dialog/EditTagIconDialog.cs
+++ src/UI.Dialog/EditTagIconDialog.cs
@@ -139,7 +139,7 @@
 			get { return icon_name; }
 			set {
 				icon_name = value;
-				preview_image.Pixbuf = GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, value, 48, (IconLookupFlags) 0);
+				PreviewPixbuf = GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, value, 48, (IconLookupFlags) 0);
 			}

 		}


Reformat code

Reformat code

--- InternetSeparationAdapter/Program.cs
+++ InternetSeparationAdapter/Program.cs
@@ -15,6 +15,7 @@
       GmailService.Scope.GmailReadonly,
       GmailService.Scope.GmailModify
     };
+
     private const string ApplicationName = "Internet Separation Adapter";

@@ -30,7 +31,7 @@
             }
             return null;
           }
-      );
+        );

       return arguments == null ? 1 : AsyncContext.Run(() => AsyncMain(arguments));
     }
@@ -38,10 +39,7 @@
     private static async Task<int> AsyncMain(Arguments arguments)
     {
       var exitToken = new CancellationTokenSource();
-      Console.CancelKeyPress += (sender, cancelArgs) =>
-      {
-        exitToken.Cancel();
-      };
+      Console.CancelKeyPress += (sender, cancelArgs) => { exitToken.Cancel(); };

       var service = new Gmail(arguments.SecretsFile, arguments.CredentialsPath, Scopes,
         ApplicationName, exitToken.Token);
@@ -59,7 +57,6 @@
         }
         catch (TaskCanceledException)
         {
-
         }
       }


added TimeOut parameter

added TimeOut parameter

--- RegexPlanet-DotNet/Test.aspx.cs
+++ RegexPlanet-DotNet/Test.aspx.cs
@@ -15,6 +15,8 @@
 			string callback = Request.Params["callback"];
 			string replacement = Request.Params["replacement"];
 			string[] inputs = Request.Params.GetValues("input");
+
+			TimeSpan timeout = TimeSpan.FromSeconds(30);

 			if (String.IsNullOrEmpty(regEx))
 			{
@@ -125,7 +127,7 @@
 						sb.Append(Server.HtmlEncode(test));
 						sb.AppendLine("</td>");

-						Match m = regularExpression.Match(test);
+						Match m = Regex.Match(test, regEx, options, timeout);

 						sb.Append("\t\t\t<td>");
 						sb.Append(Server.HtmlEncode(BooleanToString(m.Success)));


Updated translations

Updated translations

--- RelicModManager/Translations.cs
+++ RelicModManager/Translations.cs
@@ -137,7 +137,7 @@
             //MainForm
             english.Add("mainFormToolTip", "Right Click for extended description");
             german.Add("mainFormToolTip", "Rechtsklick für eine erweiterte Beschreibung");
-            polish.Add("mainFormToolTip", "TODO");
+            polish.Add("mainFormToolTip", "Rozwiń opis PPM");
             french.Add("mainFormToolTip", "TODO");

@@ -1212,7 +1212,7 @@
             //Window header
             english.Add("foundOldFilesHeader", "Old Files Question");
             german.Add("foundOldFilesHeader", "alte Dateien löschen");
-            polish.Add("foundOldFilesHeader", "Stare pliki Pytanie");
+            polish.Add("foundOldFilesHeader", "Zapytanie o starsze wersje plików");
             french.Add("foundOldFilesHeader", "Question pour les fichiers anciens (français seulement)");

             //Componet: Found zip files to delete 1
@@ -1456,7 +1456,7 @@
             //function checkForOldZipFiles()
             english.Add("parseDownloadFolderFailed", "Parsing the \"{0}\" folder failed.");
             german.Add("parseDownloadFolderFailed", "Durchsehen des \"{0}\" Verzeichnisses ist fehlgeschlagen.");
-            polish.Add("parseDownloadFolderFailed", "Nie udało się przetworzyć katalogu \"{0}\".");
+            polish.Add("parseDownloadFolderFailed", "Pobieranie informacji o folderze \"{ 0}\" zakończone niepowodzeniem");
             french.Add("parseDownloadFolderFailed", "L'analyse du dossier \"{0}\" a échoué.");

             //Componet: installation finished
@@ -1500,7 +1500,7 @@
             //
             english.Add("CloseApplicationButton", "Close the application?");
             german.Add("CloseApplicationButton", "Anwendung schließen");
-            polish.Add("CloseApplicationButton", "TODO");
+            polish.Add("CloseApplicationButton", "Zamknij aplikację or Zamknij program");
             french.Add("CloseApplicationButton", "Fermer l'application");

             //Componet: StartXVMStatButton_Click


Se soluciono un error en Edit de repuestos

--- LaTuerca/Views/Repuestos/Edit.cshtml
+++ LaTuerca/Views/Repuestos/Edit.cshtml
@@ -37,7 +37,7 @@

             @Html.LabelFor(model => model.Repuesto.Modelo, htmlAttributes: new { @class = "control-label col-md-2" })

-                @Html.DropDownList("Modelo", new SelectList(Model.Modelos, "Id", "Nombre"), new { @class = "form-control" })
+                @Html.DropDownList("Modelo", new SelectList(Model.Modelos, "Id", "NombreModelo"), new { @class = "form-control" })
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#crearModelo">
                     +
                 </button>


Remove temporary test

Remove temporary test

--- MAB.DotIgnore.Test/WildMatchTests.cs
+++ MAB.DotIgnore.Test/WildMatchTests.cs
@@ -88,15 +88,6 @@
             Assert.IsTrue(match == WildMatch.MATCH);
         }

-        [Test]
-        public void Tmp()
-        {
-            var match = WildMatch.IsMatch("**[!te]", "ten", MatchFlags.NONE);
-            Assert.IsTrue(match == WildMatch.ABORT_MALFORMED);
-        }
-
-
-
         [TearDown]
         public void TearDown()
         {


Mag-Tools: New version #

Mag-Tools: New version #

--- Mag-Tools/Properties/AssemblyInfo.cs
+++ Mag-Tools/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.1")]


move selectedObject(s)

move selectedObject(s)

--- Main/WpfPropertyGrid/PropertyGrid.cs
+++ Main/WpfPropertyGrid/PropertyGrid.cs
@@ -183,274 +183,6 @@

         #region SelectedObject
-
-        #endregion
-
-        #region SelectedObjects
-
-        #endregion
-
-        #region Properties
-
-        #endregion
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has properties.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance has properties; otherwise, <c>false</c>.
-        /// </value>
-        public bool HasProperties
-        {
-            get { return _properties != null && _properties.Count > 0; }
-        }
-
-        #region PropertyComparer
-
-        #endregion
-
-        #region CategoryComparer
-
-        #endregion
-
-        #region Categories
-
-        #endregion
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has categories.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance has categories; otherwise, <c>false</c>.
-        /// </value>
-        public bool HasCategories
-        {
-            get { return _categories != null && _categories.Count > 0; }
-        }
-
-        #region ShowReadOnlyProperties property
-
-        #endregion
-
-        #region ShowAttachedProperties property
-
-        #endregion
-
-        #region PropertyFilter
-
-        #endregion
-
-        #region PropertyFilterVisibility
-
-        #endregion
-
-        #region PropertyDisplayMode
-
-        #endregion
-
-        #endregion
-
-        #region ctor
-        static PropertyGrid()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(ThisType, new FrameworkPropertyMetadata(ThisType));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyGrid"/> class.
-        /// </summary>
-        public PropertyGrid()
-        {
-            EventManager.RegisterClassHandler(typeof(PropertyGrid), GotFocusEvent, new RoutedEventHandler(ShowDescription), true);
-
-            // Assign Layout to be Alphabetical by default
-            Layout = new AlphabeticalLayout();
-
-            // Wire command bindings
-            InitializeCommandBindings();
-#if TRIAL
-            SetTrial();
-#endif
-        }
-
-        private void ShowDescription(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource == null || !(e.OriginalSource is FrameworkElement) ||
-                (e.OriginalSource as FrameworkElement).DataContext == null ||
-                !((e.OriginalSource as FrameworkElement).DataContext is PropertyItemValue) ||
-                ((e.OriginalSource as FrameworkElement).DataContext as PropertyItemValue).ParentProperty == null)
-                return;
-            var descri = ((e.OriginalSource as FrameworkElement).DataContext as PropertyItemValue).ParentProperty.ToolTip;
-            CurrentDescription = descri == null ? "" : descri.ToString();
-        }
-
-        #endregion
-
-        #region CurrentDescription
-
-        /// <summary>
-        /// CurrentDescription Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty CurrentDescriptionProperty =
-            DependencyProperty.Register("CurrentDescription", typeof(string), typeof(PropertyGrid),
-                new FrameworkPropertyMetadata((string)"",
-                    new PropertyChangedCallback(OnCurrentDescriptionChanged)));
-
-        /// <summary>
-        /// Gets or sets the CurrentDescription property.
-        /// </summary>
-        public string CurrentDescription
-        {
-            get { return (string)GetValue(CurrentDescriptionProperty); }
-            set { SetValue(CurrentDescriptionProperty, value); }
-        }
-
-        /// <summary>
-        /// Handles changes to the CurrentDescription property.
-        /// </summary>
-        private static void OnCurrentDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((PropertyGrid)d).OnCurrentDescriptionChanged(e);
-        }
-
-        /// <summary>
-        /// Provides derived classes an opportunity to handle changes to the CurrentDescription property.
-        /// </summary>
-        protected virtual void OnCurrentDescriptionChanged(DependencyPropertyChangedEventArgs e)
-        {
-        }
-
-        #endregion
-
-
-        /// <summary>
-        /// Identifies the <see cref="PropertyEditingStarted"/> routed event.
-        /// </summary>
-        public static readonly RoutedEvent PropertyEditingStartedEvent =
-          EventManager.RegisterRoutedEvent("PropertyEditingStarted", RoutingStrategy.Bubble, typeof(PropertyEditingEventHandler), ThisType);
-
-        /// <summary>
-        /// Occurs when property editing is started.
-        /// </summary>
-        /// <remarks>
-        /// This event is intended to be used in customization scenarios. It is not used by PropertyGrid control directly.
-        /// </remarks>
-        public event RoutedEventHandler PropertyEditingStarted
-        {
-            add { AddHandler(PropertyEditingStartedEvent, value); }
-            remove { RemoveHandler(PropertyEditingStartedEvent, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="PropertyEditingFinished"/> routed event.
-        /// </summary>
-        public static readonly RoutedEvent PropertyEditingFinishedEvent =
-          EventManager.RegisterRoutedEvent("PropertyEditingFinished", RoutingStrategy.Bubble, typeof(PropertyEditingEventHandler), ThisType);
-
-        /// <summary>
-        /// Occurs when property editing is finished.
-        /// </summary>
-        /// <remarks>
-        /// This event is intended to be used in customization scenarios. It is not used by PropertyGrid control directly.
-        /// </remarks>
-        public event RoutedEventHandler PropertyEditingFinished
-        {
-            add { AddHandler(PropertyEditingFinishedEvent, value); }
-            remove { RemoveHandler(PropertyEditingFinishedEvent, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="PropertyValueChanged"/> routed event.
-        /// </summary>
-        public static readonly RoutedEvent PropertyValueChangedEvent =
-          EventManager.RegisterRoutedEvent("PropertyValueChanged", RoutingStrategy.Bubble, typeof(PropertyValueChangedEventHandler), ThisType);
-
-        /// <summary>
-        /// Occurs when property item value is changed.
-        /// </summary>
-        public event PropertyValueChangedEventHandler PropertyValueChanged
-        {
-            add { AddHandler(PropertyValueChangedEvent, value); }
-            remove { RemoveHandler(PropertyValueChangedEvent, value); }
-        }
-
-        private void RaisePropertyValueChangedEvent(PropertyItem property, object oldValue)
-        {
-            var args = new PropertyValueChangedEventArgs(PropertyValueChangedEvent, property, oldValue);
-            RaiseEvent(args);
-        }
-
-        /// <summary>
-        /// Occurs when selected objects are changed.
-        /// </summary>
-        public event EventHandler SelectedObjectsChanged;
-
-        /// <summary>
-        /// Called when selected objects were changed.
-        /// </summary>
-        protected virtual void OnSelectedObjectsChanged()
-        {
-            var handler = SelectedObjectsChanged;
-            if (handler != null) handler(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ItemsBackground"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ItemsBackgroundProperty =
-          DependencyProperty.Register("ItemsBackground", typeof(Brush), ThisType, new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.None));
-
-        /// <summary>
-        /// Gets or sets the brush for items background. This is a dependency property.
-        /// </summary>
-        /// <value>The items background brush.</value>
-        public Brush ItemsBackground
-        {
-            get { return (Brush)GetValue(ItemsBackgroundProperty); }
-            set { SetValue(ItemsBackgroundProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="ItemsForeground"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ItemsForegroundProperty =
-          DependencyProperty.Register("ItemsForeground", typeof(Brush), ThisType, new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.None));
-
-        /// <summary>
-        /// Gets or sets the items foreground brush. This is a dependency property.
-        /// </summary>
-        /// <value>The items foreground brush.</value>
-        public Brush ItemsForeground
-        {
-            get { return (Brush)GetValue(ItemsForegroundProperty); }
-            set { SetValue(ItemsForegroundProperty, value); }
-        }
-
-        /// <summary>
-        /// Identifies the <see cref="Layout"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty LayoutProperty =
-         DependencyProperty.Register("Layout", typeof(Control), ThisType,
-         new FrameworkPropertyMetadata(default(AlphabeticalLayout), FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnLayoutChanged));
-
-        private static void OnLayoutChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            var layoutContainer = e.NewValue as Control;
-            if (layoutContainer != null)
-                layoutContainer.DataContext = sender;
-        }
-
-        /// <summary>
-        /// Gets or sets the layout to be used to display properties.
-        /// </summary>
-        /// <value>The layout to be used to display properties.</value>
-        public Control Layout
-        {
-            get { return (Control)GetValue(LayoutProperty); }
-            set { SetValue(LayoutProperty, value); }
-        }
-
-
         /// <summary>
         /// Gets or sets the selected object.
         /// </summary>
@@ -460,7 +192,9 @@
             get { return (currentObjects != null && currentObjects.Length != 0) ? currentObjects[0] : null; }
             set { SelectedObjects = (value == null) ? new object[0] : new[] { value }; }
         }
-
+        #endregion
+
+        #region SelectedObjects
         /// <summary>
         /// Gets or sets the selected objects.
         /// </summary>
@@ -530,6 +264,272 @@
                 }
             }
         }
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has properties.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has properties; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasProperties
+        {
+            get { return _properties != null && _properties.Count > 0; }
+        }
+
+        #region PropertyComparer
+
+        #endregion
+
+        #region CategoryComparer
+
+        #endregion
+
+        #region Categories
+
+        #endregion
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has categories.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has categories; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasCategories
+        {
+            get { return _categories != null && _categories.Count > 0; }
+        }
+
+        #region ShowReadOnlyProperties property
+
+        #endregion
+
+        #region ShowAttachedProperties property
+
+        #endregion
+
+        #region PropertyFilter
+
+        #endregion
+
+        #region PropertyFilterVisibility
+
+        #endregion
+
+        #region PropertyDisplayMode
+
+        #endregion
+
+        #endregion
+
+        #region ctor
+        static PropertyGrid()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(ThisType, new FrameworkPropertyMetadata(ThisType));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PropertyGrid"/> class.
+        /// </summary>
+        public PropertyGrid()
+        {
+            EventManager.RegisterClassHandler(typeof(PropertyGrid), GotFocusEvent, new RoutedEventHandler(ShowDescription), true);
+
+            // Assign Layout to be Alphabetical by default
+            Layout = new AlphabeticalLayout();
+
+            // Wire command bindings
+            InitializeCommandBindings();
+#if TRIAL
+            SetTrial();
+#endif
+        }
+
+        private void ShowDescription(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource == null || !(e.OriginalSource is FrameworkElement) ||
+                (e.OriginalSource as FrameworkElement).DataContext == null ||
+                !((e.OriginalSource as FrameworkElement).DataContext is PropertyItemValue) ||
+                ((e.OriginalSource as FrameworkElement).DataContext as PropertyItemValue).ParentProperty == null)
+                return;
+            var descri = ((e.OriginalSource as FrameworkElement).DataContext as PropertyItemValue).ParentProperty.ToolTip;
+            CurrentDescription = descri == null ? "" : descri.ToString();
+        }
+
+        #endregion
+
+        #region CurrentDescription
+
+        /// <summary>
+        /// CurrentDescription Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CurrentDescriptionProperty =
+            DependencyProperty.Register("CurrentDescription", typeof(string), typeof(PropertyGrid),
+                new FrameworkPropertyMetadata((string)"",
+                    new PropertyChangedCallback(OnCurrentDescriptionChanged)));
+
+        /// <summary>
+        /// Gets or sets the CurrentDescription property.
+        /// </summary>
+        public string CurrentDescription
+        {
+            get { return (string)GetValue(CurrentDescriptionProperty); }
+            set { SetValue(CurrentDescriptionProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CurrentDescription property.
+        /// </summary>
+        private static void OnCurrentDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((PropertyGrid)d).OnCurrentDescriptionChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CurrentDescription property.
+        /// </summary>
+        protected virtual void OnCurrentDescriptionChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// Identifies the <see cref="PropertyEditingStarted"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent PropertyEditingStartedEvent =
+          EventManager.RegisterRoutedEvent("PropertyEditingStarted", RoutingStrategy.Bubble, typeof(PropertyEditingEventHandler), ThisType);
+
+        /// <summary>
+        /// Occurs when property editing is started.
+        /// </summary>
+        /// <remarks>
+        /// This event is intended to be used in customization scenarios. It is not used by PropertyGrid control directly.
+        /// </remarks>
+        public event RoutedEventHandler PropertyEditingStarted
+        {
+            add { AddHandler(PropertyEditingStartedEvent, value); }
+            remove { RemoveHandler(PropertyEditingStartedEvent, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="PropertyEditingFinished"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent PropertyEditingFinishedEvent =
+          EventManager.RegisterRoutedEvent("PropertyEditingFinished", RoutingStrategy.Bubble, typeof(PropertyEditingEventHandler), ThisType);
+
+        /// <summary>
+        /// Occurs when property editing is finished.
+        /// </summary>
+        /// <remarks>
+        /// This event is intended to be used in customization scenarios. It is not used by PropertyGrid control directly.
+        /// </remarks>
+        public event RoutedEventHandler PropertyEditingFinished
+        {
+            add { AddHandler(PropertyEditingFinishedEvent, value); }
+            remove { RemoveHandler(PropertyEditingFinishedEvent, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="PropertyValueChanged"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent PropertyValueChangedEvent =
+          EventManager.RegisterRoutedEvent("PropertyValueChanged", RoutingStrategy.Bubble, typeof(PropertyValueChangedEventHandler), ThisType);
+
+        /// <summary>
+        /// Occurs when property item value is changed.
+        /// </summary>
+        public event PropertyValueChangedEventHandler PropertyValueChanged
+        {
+            add { AddHandler(PropertyValueChangedEvent, value); }
+            remove { RemoveHandler(PropertyValueChangedEvent, value); }
+        }
+
+        private void RaisePropertyValueChangedEvent(PropertyItem property, object oldValue)
+        {
+            var args = new PropertyValueChangedEventArgs(PropertyValueChangedEvent, property, oldValue);
+            RaiseEvent(args);
+        }
+
+        /// <summary>
+        /// Occurs when selected objects are changed.
+        /// </summary>
+        public event EventHandler SelectedObjectsChanged;
+
+        /// <summary>
+        /// Called when selected objects were changed.
+        /// </summary>
+        protected virtual void OnSelectedObjectsChanged()
+        {
+            var handler = SelectedObjectsChanged;
+            if (handler != null) handler(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="ItemsBackground"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ItemsBackgroundProperty =
+          DependencyProperty.Register("ItemsBackground", typeof(Brush), ThisType, new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.None));
+
+        /// <summary>
+        /// Gets or sets the brush for items background. This is a dependency property.
+        /// </summary>
+        /// <value>The items background brush.</value>
+        public Brush ItemsBackground
+        {
+            get { return (Brush)GetValue(ItemsBackgroundProperty); }
+            set { SetValue(ItemsBackgroundProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="ItemsForeground"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty ItemsForegroundProperty =
+          DependencyProperty.Register("ItemsForeground", typeof(Brush), ThisType, new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.None));
+
+        /// <summary>
+        /// Gets or sets the items foreground brush. This is a dependency property.
+        /// </summary>
+        /// <value>The items foreground brush.</value>
+        public Brush ItemsForeground
+        {
+            get { return (Brush)GetValue(ItemsForegroundProperty); }
+            set { SetValue(ItemsForegroundProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Layout"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty LayoutProperty =
+         DependencyProperty.Register("Layout", typeof(Control), ThisType,
+         new FrameworkPropertyMetadata(default(AlphabeticalLayout), FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnLayoutChanged));
+
+        private static void OnLayoutChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            var layoutContainer = e.NewValue as Control;
+            if (layoutContainer != null)
+                layoutContainer.DataContext = sender;
+        }
+
+        /// <summary>
+        /// Gets or sets the layout to be used to display properties.
+        /// </summary>
+        /// <value>The layout to be used to display properties.</value>
+        public Control Layout
+        {
+            get { return (Control)GetValue(LayoutProperty); }
+            set { SetValue(LayoutProperty, value); }
+        }
+
+
+
+
+

         private GridEntryCollection<PropertyItem> _properties;
         /// <summary>


Fix of Manager controller WhoAmI-issues

Fix of Manager controller WhoAmI-issues

--- Manager/Manager/ManagerController.cs
+++ Manager/Manager/ManagerController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web.Http;
 using System.Web.Http.Results;
@@ -22,25 +23,13 @@
 		public ManagerController(INodeManager nodeManager,
 		                         JobManager jobManager)
 		{
-
-			WhoAmI =
-				"[MANAGER, " + Environment.MachineName.ToUpper() + "]";
-
 			_nodeManager = nodeManager;
 			_jobManager = jobManager;
 		}

-		public string WhoAmI { get; private set; }
-
 		[HttpPost, Route(ManagerRouteConstants.Job)]
 		public IHttpActionResult DoThisJob([FromBody] JobRequestModel job)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
 			if (job == null)
 			{
 				return new BadRequestResult(Request);
@@ -62,11 +51,10 @@
 				UserName = job.UserName,
 				Id = Guid.NewGuid()
 			};
-
 			_jobManager.Add(jobReceived);

 			var msg = string.Format("{0} : New job received from client ( jobId, jobName ) : ( {1}, {2} )",
-			                        WhoAmI,
+			                        WhoAmI(Request),
 			                        jobReceived.Id,
 			                        jobReceived.Name);

@@ -81,14 +69,8 @@
 		[HttpDelete, Route(ManagerRouteConstants.CancelJob)]
 		public IHttpActionResult CancelThisJob(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
-			LogHelper.LogInfoWithLineNumber(Logger,
-			                                WhoAmI + ": Received job cancel from client ( jobId ) : ( " + jobId + " )");
+			LogHelper.LogInfoWithLineNumber(Logger,
+											WhoAmI(Request) + ": Received job cancel from client ( jobId ) : ( " + jobId + " )");

 			_jobManager.CancelThisJob(jobId);

@@ -98,12 +80,6 @@
 		[HttpGet, Route(ManagerRouteConstants.GetJobHistoryList)]
 		public IHttpActionResult JobHistoryList()
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
 			var jobHistory = _jobManager.GetJobHistoryList();

 			return Ok(jobHistory);
@@ -112,12 +88,6 @@
 		[HttpGet, Route(ManagerRouteConstants.GetJobHistory)]
 		public IHttpActionResult JobHistory(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
 			var jobHistory = _jobManager.GetJobHistory(jobId);

 			return Ok(jobHistory);
@@ -126,12 +96,6 @@
 		[HttpGet, Route(ManagerRouteConstants.JobDetail)]
 		public IHttpActionResult JobHistoryDetails(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
 			var jobHistoryDetail = _jobManager.JobHistoryDetails(jobId);

 			return Ok(jobHistoryDetail);
@@ -140,37 +104,25 @@
 		[HttpPost, Route(ManagerRouteConstants.Heartbeat)]
 		public IHttpActionResult Heartbeat([FromBody] Uri nodeUri)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
 			if (nodeUri != null)
 			{
 				Task.Factory.StartNew(() => { _jobManager.RegisterHeartbeat(nodeUri.ToString()); });

 				LogHelper.LogInfoWithLineNumber(Logger,
-				                                WhoAmI + ": Received heartbeat from Node. Node Uri : ( " + nodeUri + " )");
+												WhoAmI(Request) + ": Received heartbeat from Node. Node Uri : ( " + nodeUri + " )");
 				return Ok();
 			}

 			LogHelper.LogWarningWithLineNumber(Logger,
-			                                   WhoAmI + ": Received heartbeat from Node with invalid uri.");
+											   WhoAmI(Request) + ": Received heartbeat from Node with invalid uri.");
 			return BadRequest();
 		}

 		[HttpPost, Route(ManagerRouteConstants.JobDone)]
 		public IHttpActionResult JobDone(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
-			LogHelper.LogInfoWithLineNumber(Logger,
-			                                WhoAmI + ": Received job done from a Node ( jobId ) : ( " + jobId + " )");
+			LogHelper.LogInfoWithLineNumber(Logger,
+											WhoAmI(Request) + ": Received job done from a Node ( jobId ) : ( " + jobId + " )");

 			Task.Factory.StartNew(() =>
 			{
@@ -186,14 +138,10 @@
 		[HttpPost, Route(ManagerRouteConstants.JobFailed)]
 		public IHttpActionResult JobFailed(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
+

 			LogHelper.LogErrorWithLineNumber(Logger,
-			                                 WhoAmI + ": Received job failed from a Node ( jobId ) : ( " + jobId + " )");
+											 WhoAmI(Request) + ": Received job failed from a Node ( jobId ) : ( " + jobId + " )");

 			Task.Factory.StartNew(() =>
 			{
@@ -209,14 +157,9 @@
 		[HttpPost, Route(ManagerRouteConstants.JobHasBeenCanceled)]
 		public IHttpActionResult JobCanceled(Guid jobId)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
-			LogHelper.LogInfoWithLineNumber(Logger,
-			                                WhoAmI + ": Received cancel from a Node ( jobId ) : ( " + jobId + " )");
+
+			LogHelper.LogInfoWithLineNumber(Logger,
+											WhoAmI(Request) + ": Received cancel from a Node ( jobId ) : ( " + jobId + " )");

 			Task.Factory.StartNew(() =>
 			{
@@ -232,11 +175,6 @@
 		[HttpPost, Route(ManagerRouteConstants.JobProgress)]
 		public IHttpActionResult JobProgress([FromBody] JobProgressModel model)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";

 			if (model == null)
 			{
@@ -257,11 +195,6 @@
 		[HttpPost, Route(ManagerRouteConstants.NodeHasBeenInitialized)]
 		public IHttpActionResult NodeInitialized([FromBody] Uri nodeUri)
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";

 			Task.Factory.StartNew(() =>
 			{
@@ -271,7 +204,7 @@
 			});

 			LogHelper.LogInfoWithLineNumber(Logger,
-			                                WhoAmI + ": Received init from Node. Node Uri : ( " + nodeUri + " )");
+											WhoAmI(Request) + ": Received init from Node. Node Uri : ( " + nodeUri + " )");

 			return Ok();
 		}
@@ -279,11 +212,6 @@
 		[HttpGet, Route(ManagerRouteConstants.Ping)]
 		public IHttpActionResult Ping()
 		{
-			var baseUrl =
-				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";

 			return Ok();
 		}
@@ -291,15 +219,23 @@
 		[HttpGet, Route(ManagerRouteConstants.Nodes)]
 		public IHttpActionResult Nodes()
 		{
-			var baseUrl =
+
+
+			var workernodes = _jobManager.Nodes();
+
+			return Ok(workernodes);
+		}
+
+		private string WhoAmI(HttpRequestMessage Request)
+		{
+			if (Request != null)
+			{
+				var baseUrl =
 				Request.RequestUri.GetLeftPart(UriPartial.Authority);
-
-			WhoAmI =
-				"[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
-
-			var workernodes = _jobManager.Nodes();
-
-			return Ok(workernodes);
+
+				return "[MANAGER, " + baseUrl + ", " + Environment.MachineName.ToUpper() + "]";
+			}
+			return "[MANAGER, " + Environment.MachineName.ToUpper() + "]";
 		}
 	}
 }


Fix for f2fb887

Fix for f2fb887

SendAsync did not work correctly.  Temporary fix by SemaphoreSlim.

--- MinChain/Runner/ConnectionManager.cs
+++ MinChain/Runner/ConnectionManager.cs
@@ -24,6 +24,7 @@
         Task listenTask;
         CancellationTokenSource tokenSource;
         CancellationToken token;
+        SemaphoreSlim sendLock;

         class ConnectionInfo
         {
@@ -44,6 +45,8 @@
             token = tokenSource.Token;

             if (localEndpoint != null) listenTask = Listen(localEndpoint);
+
+            sendLock = new SemaphoreSlim(1);
         }

         public void Dispose()
@@ -176,31 +179,17 @@
                 select SendAsync(message, peer));
         }

-        Task SendAsync(Message message, ConnectionInfo connection)
+        async Task SendAsync(Message message, ConnectionInfo connection)
         {
             // This method may be called concurrently.
-
             var bytes = Serialize(message);
-            Func<Task, Task> writeContinue = async _ =>
-            {
-                try
-                {
-                    await connection.Stream.WriteChunkAsync(bytes, token);
-                }
-                catch
-                {
-                    // Shutdown the connection whatever the exception is.
-                    // Eventually ReadLoop will take care Dispose.
-                    connection.Client.Client.Shutdown(SocketShutdown.Both);
-                }
-            };
-
-            lock (connection)
-            {
-                // To ensure the sequential write.
-                return connection.LastWrite =
-                    connection.LastWrite.ContinueWith(writeContinue);
-            }
+
+            try
+            {
+                await sendLock.WaitAsync(token);
+                await connection.Stream.WriteChunkAsync(bytes, token);
+            }
+            finally { sendLock.Release(); }
         }

         public IEnumerable<EndPoint> GetPeers()


Better user management in amm.

Better user management in amm.

--- UnnITBooster/StudentMarking/frmAutomaticMarkingMachine.cs
+++ UnnITBooster/StudentMarking/frmAutomaticMarkingMachine.cs
@@ -106,12 +106,17 @@
                         "SUB_email like '%" + txtStudentId.Text.Replace("'", "''") + "%'";
                 }

+                var dt = _config.GetDataTable(sql);
+                if (dt.Rows.Count == 1)
+                {
+                    txtStudentId.Text = dt.Rows[0]["SUB_id"].ToString();
+                    UpdateStudentReport();
+                    return;
+                }
+
                 var mc =  _config.GetMarkCalculator();
-
-
                 var sb = new StringBuilder();
                 var sbDataUpload = new StringBuilder();
-                var dt = _config.GetDataTable(sql);
                 foreach (DataRow item in dt.Rows)
                 {
                     var totmark = mc.GetFinalMark(item["SUB_NumericUserId"].ToString(), _config);


Update Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs

Co-Authored-By: Julia Schwarz <4ad3dc992ad5e6b951fd602d4e676fad16b873b6@gmail.com>

--- Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs
+++ Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/FingerCursor.cs
@@ -231,7 +231,7 @@
             // not translate to the finger pad if the user is poking with a horizontal finger
             float fingerSurfaceDot = Vector3.Dot(tipNormal, -surfaceNormal);

-            // Lerping an agular measurement from 0 degrees (default cursor position at tip of finger) to
+            // Lerping an angular measurement from 0 degrees (default cursor position at tip of finger) to
             // 90 degrees (a new position on the fingertip pad) around the fingertip's X axis.
             Quaternion degreesRelative = Quaternion.AngleAxis((1f - t) * 90f * (1f - fingerSurfaceDot), indexFingerRingRenderer.transform.right);


code refactor

code refactor

--- Assets/Plugins/Countly/Services/Impls/Actual/RemoteConfigCountlyService.cs
+++ Assets/Plugins/Countly/Services/Impls/Actual/RemoteConfigCountlyService.cs
@@ -28,6 +28,8 @@
             _configDao = configDao;
             _countlyUtils = countlyUtils;
             _requestCountlyHelper = requestCountlyHelper;
+
+            Configs = FetchConfigFromDB();
         }

         public async Task<CountlyResponse> InitConfig()
@@ -53,7 +55,6 @@

         public async Task<CountlyResponse> Update()
         {
-            Configs = FetchConfigFromDB();
             var requestParams =
                 new Dictionary<string, object>
                 {


added check for active platform when running tests in the editor

--HG--
branch : stable

--- Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs
+++ Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnityEditor;
-using UnityEditorInternal;
-using UnityEngine;
-using UnityTest.IntegrationTests;
-
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityTest.IntegrationTests;
+
 namespace UnityTest
 {
     public static partial class Batch
@@ -68,7 +68,9 @@
         }

         private static void RunInEditor(List<string> sceneList)
-        {
+        {
+            CheckActiveBuildTarget();
+
             NetworkResultsReceiver.StopReceiver();
             if (sceneList == null || sceneList.Count == 0)
             {
@@ -93,8 +95,21 @@
             NetworkResultsReceiver.StartReceiver(config);

             EditorApplication.isPlaying = true;
-        }
-
+        }
+
+        static void CheckActiveBuildTarget()
+        {
+            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.MetroPlayer
+                || EditorUserBuildSettings.activeBuildTarget == BuildTarget.WebPlayer
+                || EditorUserBuildSettings.activeBuildTarget == BuildTarget.WebPlayerStreamed)
+            {
+                Debug.Log("Changing activeBuildTarget because "
+                    + EditorUserBuildSettings.activeBuildTarget +
+                    " is not supported");
+                EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneLinux);
+            }
+        }
+
         private static BuildTarget ? GetTargetPlatform()
         {
             string platformString = null;


updated default values for new Address in UsersAsyncService

--- WhenItsDone/Lib/WhenItsDone.Services/UsersAsyncService.cs
+++ WhenItsDone/Lib/WhenItsDone.Services/UsersAsyncService.cs
@@ -169,9 +169,9 @@
         private Address CreateNewAddress()
         {
             var newAddress = this.addressFactory.CreateAddress();
-            newAddress.Country = "Not set.";
-            newAddress.Street = "Not set.";
-            newAddress.City = "Not set.";
+            newAddress.Country = "Country not set.";
+            newAddress.Street = "Street not set.";
+            newAddress.City = "City not set.";

             return newAddress;
         }


improve comment

improve comment

--- MongoProviders/MembershipProvider.cs
+++ MongoProviders/MembershipProvider.cs
@@ -809,7 +809,12 @@
 		/// <summary>
 		/// Gets a collection of membership users where the e-mail address matches the specified string.
 		/// </summary>
-		/// <param name="emailToMatch">The e-mail address to search for.</param>
+		/// <param name="emailToMatch">The e-mail address to search for.
+        /// Match string may contain the standard SQL LIKE wildcard: %
+        ///   "sm%"  -> StartsWith("sm")
+        ///   "%ith" -> EndsWith("ith")
+        ///   "%mit%" -> Contains("mit")
+        /// </param>
 		/// <param name="pageIndex">The index of the page of results to return. <paramref name="pageIndex"/> is zero-based.</param>
 		/// <param name="pageSize">The size of the page of results to return.</param>
 		/// <param name="totalRecords">The total number of matched users.</param>


Use server delete marker message instead of relying on clientside timeouts

--- ARGame/Assets/Scripts/Network/PositionPreviewer.cs
+++ ARGame/Assets/Scripts/Network/PositionPreviewer.cs
@@ -45,12 +45,10 @@
         {
             public int ID;
             public GameObject Object { get; private set; }
-            public DateTime LastUpdate { get; private set; }

             public MarkerState(PositionUpdate initialUpdate, GameObject referenceMarker)
             {
                 this.ID = initialUpdate.ID;
-                this.LastUpdate = new DateTime();

                 // Create mesh representing this marker
                 this.Object = GameObject.Instantiate(referenceMarker);
@@ -63,23 +61,20 @@

             public void Update(PositionUpdate update)
             {
-                this.LastUpdate = DateTime.Now;
+                if (update.Type == UpdateType.Update)
+                {
+                    // Update orientation of object
+                    this.Object.SetActive(true);

-                // Update orientation of object
-                this.Object.SetActive(true);
+                    this.Object.transform.position = new Vector3(
+                        update.X * ScaleFactor,
+                        0,
+                        VerticalOffset - (update.Y * ScaleFactor));

-                this.Object.transform.position = new Vector3(
-                    update.X * ScaleFactor,
-                    0,
-                    VerticalOffset - (update.Y * ScaleFactor));
-
-                this.Object.transform.eulerAngles = new Vector3(0, update.Rotation, 0);
-            }
-
-            public void CheckTimeout()
-            {
-                if ((DateTime.Now - LastUpdate).TotalMilliseconds > TimeoutTime)
+                    this.Object.transform.eulerAngles = new Vector3(0, update.Rotation, 0);
+                } else if (update.Type == UpdateType.Delete)
                 {
+                    // Remove object
                     this.Object.SetActive(false);
                 }
             }
@@ -112,17 +107,6 @@
         }

         /// <summary>
-        /// Check all markers to see if any need to be hidden because they timed out.
-        /// </summary>
-        public void Update()
-        {
-            foreach (var pair in markers)
-            {
-                pair.Value.CheckTimeout();
-            }
-        }
-
-        /// <summary>
         /// Disable reference marker, because it's only used as template.
         /// </summary>
         public void Start()


More code cosmetics

More code cosmetics

--- MouseTester/MouseTester/MousePlot.cs
+++ MouseTester/MouseTester/MousePlot.cs
@@ -23,12 +23,28 @@

         class GraphType
         {
+            public enum GT : byte
+            {
+                normal,
+                dual,
+                nolines
+            }
+
             string Name;
             public GraphFunction PlotFunc;
-
-            public GraphType(string Name, GraphFunction PlotFunc)
+            private GT _DualGraph;
+            public GT DualGraph
+            {
+                get
+                {
+                    return _DualGraph;
+                }
+            }
+
+            public GraphType(string Name, GT DualGraph, GraphFunction PlotFunc)
             {
                 this.Name = Name;
+                this._DualGraph = DualGraph;
                 this.PlotFunc = PlotFunc;
             }

@@ -62,14 +78,14 @@

             GraphType[] grapthtypes =
             {
-                new GraphType("xCount vs. Time", plot_xcounts_vs_time),
-                new GraphType("yCount vs. Time", plot_ycounts_vs_time),
-                new GraphType("xyCount vs. Time", plot_xycounts_vs_time),
-                new GraphType("Interval vs. Time", plot_interval_vs_time),
-                new GraphType("xVelocity vs. Time", plot_xvelocity_vs_time),
-                new GraphType("yVelocity vs. Time", plot_yvelocity_vs_time),
-                new GraphType("xyVelocity vs. Time", plot_xyvelocity_vs_time),
-                new GraphType("X vs. Y", plot_x_vs_y),
+                new GraphType("xCount vs. Time", GraphType.GT.normal, plot_xcounts_vs_time),
+                new GraphType("yCount vs. Time", GraphType.GT.normal, plot_ycounts_vs_time),
+                new GraphType("xyCount vs. Time", GraphType.GT.dual, plot_xycounts_vs_time),
+                new GraphType("Interval vs. Time", GraphType.GT.normal, plot_interval_vs_time),
+                new GraphType("xVelocity vs. Time", GraphType.GT.normal, plot_xvelocity_vs_time),
+                new GraphType("yVelocity vs. Time", GraphType.GT.normal, plot_yvelocity_vs_time),
+                new GraphType("xyVelocity vs. Time", GraphType.GT.dual, plot_xyvelocity_vs_time),
+                new GraphType("X vs. Y", GraphType.GT.nolines, plot_x_vs_y),
             };

             foreach (GraphType type in grapthtypes)
@@ -129,7 +145,39 @@
                 return;
             }
             else
+            {
                 type.PlotFunc();
+
+                if (type.DualGraph == GraphType.GT.nolines)
+                {
+                    pm.Series.Add(scatterSeries1);
+                    if (checkBoxLines.Checked)
+                    {
+                        pm.Series.Add(lineSeries1);
+                    }
+                }
+                else
+                {
+                    pm.Series.Add(scatterSeries1);
+                    if (!checkBoxLines.Checked)
+                        plot_fit(scatterSeries1, lineSeries1);
+
+                    pm.Series.Add(lineSeries1);
+                    if (checkBoxStem.Checked)
+                        pm.Series.Add(stemSeries1);
+
+                    if (type.DualGraph == GraphType.GT.dual)
+                    {
+                        pm.Series.Add(scatterSeries2);
+                        if (!checkBoxLines.Checked)
+                            plot_fit(scatterSeries2, lineSeries2);
+
+                        pm.Series.Add(lineSeries2);
+                        if (checkBoxStem.Checked)
+                            pm.Series.Add(stemSeries2);
+                    }
+                }
+            }

             var linearAxis1 = new LinearAxis();
             linearAxis1.AbsoluteMinimum = x_min - (x_max - x_min) / 20.0;
@@ -248,20 +296,6 @@
                 lineSeries1.Points.Add(new DataPoint(x, y));
                 stemSeries1.Points.Add(new DataPoint(x, y));
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-            }
-            pm.Series.Add(lineSeries1);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-            }
-
         }

         private void plot_ycounts_vs_time()
@@ -278,19 +312,6 @@
                 lineSeries1.Points.Add(new DataPoint(x, y));
                 stemSeries1.Points.Add(new DataPoint(x, y));
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-            }
-            pm.Series.Add(lineSeries1);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-            }
         }

         private void plot_xycounts_vs_time()
@@ -317,24 +338,6 @@
                 lineSeries2.Points.Add(new DataPoint(x, y));
                 stemSeries2.Points.Add(new DataPoint(x, y));
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            pm.Series.Add(scatterSeries2);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-                plot_fit(scatterSeries2, lineSeries2);
-            }
-            pm.Series.Add(lineSeries1);
-            pm.Series.Add(lineSeries2);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-                pm.Series.Add(stemSeries2);
-            }
-
         }

         private void plot_interval_vs_time()
@@ -359,19 +362,6 @@
                 lineSeries1.Points.Add(new DataPoint(x, y));
                 stemSeries1.Points.Add(new DataPoint(x, y));
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-            }
-            pm.Series.Add(lineSeries1);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-            }
         }

         private void plot_xvelocity_vs_time()
@@ -403,19 +393,6 @@
             {
                 MessageBox.Show("CPI value is invalid, please run Measure");
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-            }
-            pm.Series.Add(lineSeries1);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-            }
         }

         private void plot_yvelocity_vs_time()
@@ -447,19 +424,6 @@
             {
                 MessageBox.Show("CPI value is invalid, please run Measure");
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-            }
-            pm.Series.Add(lineSeries1);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-            }
         }

         private void plot_xyvelocity_vs_time()
@@ -509,24 +473,6 @@
             {
                 MessageBox.Show("CPI value is invalid, please run Measure");
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            pm.Series.Add(scatterSeries2);
-            if (!checkBoxLines.Checked)
-            {
-                plot_fit(scatterSeries1, lineSeries1);
-                plot_fit(scatterSeries2, lineSeries2);
-            }
-            pm.Series.Add(lineSeries1);
-            pm.Series.Add(lineSeries2);
-            if (checkBoxStem.Checked)
-            {
-                pm.Series.Add(stemSeries1);
-                pm.Series.Add(stemSeries2);
-            }
-
         }

         private void plot_x_vs_y()
@@ -545,14 +491,6 @@
                 scatterSeries1.Points.Add(new ScatterPoint(x, y));
                 lineSeries1.Points.Add(new DataPoint(x, y));
             }
-
-            PlotModel pm = plot1.Model;
-
-            pm.Series.Add(scatterSeries1);
-            if (checkBoxLines.Checked)
-            {
-                pm.Series.Add(lineSeries1);
-            }
         }

 #if true


Cache BindingKeys.

Cache BindingKeys.


Escape options

Escape options

--- Mvc.JQuery.Datatables/DataTableVm.cs
+++ Mvc.JQuery.Datatables/DataTableVm.cs
@@ -108,7 +108,8 @@

             public TTarget Select(params string[] options)
             {
-                AddRule("{type: 'select', values: ['" + string.Join("','", options) + "']}");
+                var escapedOptions = options.Select(o => o.Replace("'", "''"));
+                AddRule("{type: 'select', values: ['" + string.Join("','", escapedOptions) + "']}");
                 return _target;
             }
             public TTarget NumberRange()
@@ -131,7 +132,8 @@

             public TTarget CheckBoxes(params string[] options)
             {
-                AddRule("{type: 'checkbox', values: ['" + string.Join("','", options) + "']}");
+                var escapedOptions = options.Select(o => o.Replace("'", "''"));
+                AddRule("{type: 'checkbox', values: ['" + string.Join("','", escapedOptions) + "']}");
                 return _target;
             }


improving performance

improving performance


コメント誤りを修正

コメント誤りを修正

--- NetstatCSarp/NetstatCSarp/Program.cs
+++ NetstatCSarp/NetstatCSarp/Program.cs
@@ -728,12 +728,12 @@
         }

         /// <summary>
-        /// サービス名とプロトコルから、ポート番号を得るディクショナリを保持します。
+        /// サービス名とポート番号から、プロトコル名を得るディクショナリを保持します。
         /// </summary>
         private static Dictionary<Protocol, Dictionary<short, string>> portToServiceName = new Dictionary<Protocol, Dictionary<short, string>>();

         /// <summary>
-        /// サービス名とプロトコルから、ポート番号を得るディクショナリを保持します。
+        /// サービス名とプロトコル名から、ポート番号を得るディクショナリを保持します。
         /// </summary>
         private static Dictionary<Protocol, Dictionary<string, short>> serviceNameToPort = new Dictionary<Protocol, Dictionary<string, short>>();


Update TestServer.cs

Update TestServer.cs

--- NetworkTablesCore.Test/TestServer.cs
+++ NetworkTablesCore.Test/TestServer.cs
@@ -12,6 +12,7 @@
         [Test]
         public void Test()
         {
+            Console.WriteLine("BeforeShuttingDown");
             NetworkTable.Shutdown();
             Console.WriteLine("Shutting Down");
             CoreMethods.SetLogger(((level, file, line, message) =>


Removed unused proeprty

Removed unused proeprty

--- Noodles.Example.Domain/Membership.cs
+++ Noodles.Example.Domain/Membership.cs
@@ -20,16 +20,5 @@
         {
             get { return _users; }
         }
-
-        [GetChild]
-        public User GetUserBySlug(string slug)
-        {
-            return Users.SingleOrDefault(u => Slugify(u) == slug);
-        }
-
-        private static string Slugify(User u)
-        {
-            return u.DisplayName.Replace(" ", "").ToLower();
-        }
     }
 }


Relax manipulator binding target type.

Relax manipulator binding target type.

--- Source/HelixToolkit.Wpf.SharpDX.Shared/Model/Elements3D/UIManipulator3D.cs
+++ Source/HelixToolkit.Wpf.SharpDX.Shared/Model/Elements3D/UIManipulator3D.cs
@@ -152,7 +152,7 @@
         /// <param name="source">
         /// Source Visual3D which receives the manipulator transforms.
         /// </param>
-        public void Bind(GeometryModel3D source)
+        public void Bind(Element3D source)
         {
             BindingOperations.SetBinding(this, TargetTransformProperty, new Binding("Transform") { Source = source });
             BindingOperations.SetBinding(this, TransformProperty, new Binding("Transform") { Source = source });


Fix build error

Fix build error

--- Source/PropertyTools.Wpf/DataGrid/ControlFactory/DataGridControlFactory.cs
+++ Source/PropertyTools.Wpf/DataGrid/ControlFactory/DataGridControlFactory.cs
@@ -19,6 +19,8 @@

     using PropertyTools.DataAnnotations;

+    using HorizontalAlignment = System.Windows.HorizontalAlignment;
+
     /// <summary>
     /// Creates display and edit controls for the DataGrid.
     /// </summary>


cheap checkout help message mod-side

cheap checkout help message mod-side

--- TwitchPlaysAssembly/Src/ComponentSolvers/Helpers/ComponentSolverFactory.cs
+++ TwitchPlaysAssembly/Src/ComponentSolvers/Helpers/ComponentSolverFactory.cs
@@ -295,7 +295,7 @@
 		ModComponentSolverInformation["BrokenButtonsModule"] = new ModuleInformation { moduleScore = 10 };
 		ModComponentSolverInformation["burglarAlarm"] = new ModuleInformation { moduleScore = 8 };
 		ModComponentSolverInformation["buttonSequencesModule"] = new ModuleInformation { moduleScore = 9, DoesTheRightThing = true };
-		ModComponentSolverInformation["CheapCheckoutModule"] = new ModuleInformation { moduleScore = 12, helpText = "Cycle the items with !{0} items. Get customers to pay the correct amount with !{0} submit. Return the proper change with !{0} submit 3.24.", DoesTheRightThing = true };
+		ModComponentSolverInformation["CheapCheckoutModule"] = new ModuleInformation { moduleScore = 12, DoesTheRightThing = true };
 		ModComponentSolverInformation["ChessModule"] = new ModuleInformation { moduleScore = 12, helpText = "Cycle the positions with !{0} cycle. Submit the safe spot with !{0} press C2.", DoesTheRightThing = false };
 		ModComponentSolverInformation["ColourFlash"] = new ModuleInformation { moduleScore = 6, helpText = "Submit the correct response with !{0} press yes 3, or !{0} press no 5.", manualCode = "Color Flash", DoesTheRightThing = false };
 		ModComponentSolverInformation["Color Generator"] = new ModuleInformation { moduleDisplayName = "Color Generator", DoesTheRightThing = true };


Removing exception raising during binary expression type resolving in favor of using an inner method exception

--- ZScript/CodeGeneration/Analysis/ExpressionTypeResolver+BinaryExpression.cs
+++ ZScript/CodeGeneration/Analysis/ExpressionTypeResolver+BinaryExpression.cs
@@ -76,11 +76,6 @@
             }

             var str = ExpressionUtils.OperatorOnExpression(context);
-            if (str == "")
-            {
-                throw new Exception("Failed to analyze binary expression correctly");
-            }
-
             var instruction = TokenFactory.InstructionForOperator(str);

             // Arithmetic instructions with any operands propagate anys


Small refactoring

Small refactoring


Fix ReadTopLevelSpecial in LdmlAdaptor. Now skips if special element does not (cannot) read the xmlns:palaso attribute.

--- Palaso/WritingSystems/LdmlAdaptor.cs
+++ Palaso/WritingSystems/LdmlAdaptor.cs
@@ -164,6 +164,10 @@
 					reader.Read();
 				}
 				reader.ReadEndElement();
+			}
+			else
+			{
+				reader.Skip();
 			}
 		}


OnAllPluginsLoaded fix

OnAllPluginsLoaded fix

--- Pluton/PluginLoaders/PluginLoader.cs
+++ Pluton/PluginLoaders/PluginLoader.cs
@@ -52,6 +52,9 @@

             // probably make an event here that others can hook?

+            if (CurrentlyLoadingPlugins.Count == 0)
+                OnAllLoaded.OnNext("");
+
             Logger.Log(String.Format("[PluginLoader] {0}<{1}> plugin was loaded successfuly.", plugin.Name, plugin.Type));
         }

@@ -62,12 +65,9 @@

         public void LoadPlugins()
         {
-            Logger.Log("number of loaders: " + PluginLoaders.Count.ToString());
             foreach (IPluginLoader loader in PluginLoaders.Values) {
                 loader.LoadPlugins();
             }
-
-            OnAllLoaded.OnNext("");
         }

         public void UnloadPlugins()


--- PotterStore/CartLibTests/CartTest.cs
+++ PotterStore/CartLibTests/CartTest.cs
@@ -32,5 +32,18 @@

 			Assert.AreEqual(expected, actual);
 		}
+
+		[TestMethod()]
+		public void GetPrice_Return_200_When_There_Are_2_Books_In_Cart()
+		{
+			var cart = new Cart();
+			cart.Add(new Book { BookName = "book1", Price = 100 });
+			cart.Add(new Book { BookName = "book1", Price = 100 });
+			var expected = 200;
+
+			var actual = cart.GetPrice();
+
+			Assert.AreEqual(expected, actual);
+		}
 	}
 }


Check that object has Location property before using it.  Removes unneeded exceptions.

--- RdlEngine/Runtime/RdlEngineConfig.cs
+++ RdlEngine/Runtime/RdlEngineConfig.cs
@@ -521,11 +521,17 @@
                     // Check to see if previously loaded.  Many CustomReportItems share same CodeModule.
                     Assembly[] allLoadedAss = AppDomain.CurrentDomain.GetAssemblies();
                     foreach (Assembly ass in allLoadedAss)
-                        if (ass.Location.Equals(codemodule, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        var type = ass.GetType();
+                        if( type.GetMethod("Location") != null)
                         {
-                            la = ass;
-                            break;
+                            if (ass.Location.Equals(codemodule, StringComparison.CurrentCultureIgnoreCase))
+                            {
+                                la = ass;
+                                break;
+                            }
                         }
+                    }

                     if (la == null)     // not previously loaded?
                         la = XmlUtil.AssemblyLoadFrom(codemodule);


Fix up a minor exception and error in how I'm runnign things.

--- LINQToTTree/LINQToTTreeLib.Tests/Statements/TestStatementRecordValue.TestTryCombineStatement.g.cs
+++ LINQToTTree/LINQToTTreeLib.Tests/Statements/TestStatementRecordValue.TestTryCombineStatement.g.cs
@@ -59,6 +59,7 @@
 }
 [TestMethod]
 [PexGeneratedBy(typeof(TestStatementRecordValue))]
+[ExpectedException(typeof(ArgumentNullException))]
 public void TestTryCombineStatement18901()
 {
     StatementInlineBlockTest.dummyVarName dummyVarName;


Fixed Double Mapping

Fixed Double Mapping

--- Projects/Components/SourceTypes/DefaultSourceTypes/AdoSources/SqlServer/SqlServerAdoSourceType.cs
+++ Projects/Components/SourceTypes/DefaultSourceTypes/AdoSources/SqlServer/SqlServerAdoSourceType.cs
@@ -153,6 +153,7 @@
                 case "REAL":
                     return DomainDataType.Single;
                 case "FLOAT":
+                    column.Precision = 0;
                     return DomainDataType.Double;
                 case "TINYINT":
                     return DomainDataType.SByte;


Revert "Revert "Bug-fix landuse""

Revert "Revert "Bug-fix landuse""

This reverts commit 02071a73d525bee619b50279ea88dd2b426e3fa6.

--- Assets/MapzenGo/Models/Factories/LanduseFactory.cs
+++ Assets/MapzenGo/Models/Factories/LanduseFactory.cs
@@ -72,46 +72,46 @@
             var _meshes = new Dictionary<LanduseKind, MeshData>();
             foreach (var geo in items.Where(x => Query(x)))
             {
+                LanduseKind kind = LanduseKind.Unknown;
                 if (geo["properties"]["kind"] != null)
-                {
-                    var kind = geo["properties"]["kind"].str.ConvertToLanduseType();
-                    if (!FactorySettings.HasSettingsFor(kind) && !JustDrawEverythingFam)
-                        continue;
+                    kind = geo["properties"]["kind"].str.ConvertToLanduseType();
+                if (!FactorySettings.HasSettingsFor(kind) && !JustDrawEverythingFam)
+                    continue;

-                    var typeSettings = FactorySettings.GetSettingsFor<LanduseSettings>(kind);
-                    if (!_meshes.ContainsKey(kind))
-                        _meshes.Add(kind, new MeshData());
+                var typeSettings = FactorySettings.GetSettingsFor<LanduseSettings>(kind);
+                if (!_meshes.ContainsKey(kind))
+                    _meshes.Add(kind, new MeshData());

-                    //foreach (var bb in geo["geometry"]["coordinates"].list)
-                    //{
-                    var bb = geo["geometry"]["coordinates"].list[0]; //this is wrong but cant fix it now
-                    var count = bb.list.Count - 1;
+                //foreach (var bb in geo["geometry"]["coordinates"].list)
+                //{
+                var bb = geo["geometry"]["coordinates"].list[0]; //this is wrong but cant fix it now
+                var count = bb.list.Count - 1;

-                    if (count < 3)
-                        continue;
+                if (count < 3)
+                    continue;

-                    var inp = new InputGeometry(count);
+                var inp = new InputGeometry(count);

-                    for (int i = 0; i < count; i++)
-                    {
-                        var c = bb.list[i];
-                        var dotMerc = GM.LatLonToMeters(c[1].f, c[0].f);
-                        var localMercPos = dotMerc - tile.Rect.Center;
-                        inp.AddPoint(localMercPos.x, localMercPos.y);
-                        inp.AddSegment(i, (i + 1) % count);
-                    }
+                for (int i = 0; i < count; i++)
+                {
+                    var c = bb.list[i];
+                    var dotMerc = GM.LatLonToMeters(c[1].f, c[0].f);
+                    var localMercPos = dotMerc - tile.Rect.Center;
+                    inp.AddPoint(localMercPos.x, localMercPos.y);
+                    inp.AddSegment(i, (i + 1) % count);
+                }

-                    CreateMesh(inp, _meshes[kind]);
+                CreateMesh(inp, _meshes[kind]);

-                    if (_meshes[kind].Vertices.Count > 64000)
-                    {
-                        CreateGameObject(kind, _meshes[kind], main.transform);
-                        _meshes[kind] = new MeshData();
-                    }
+                if (_meshes[kind].Vertices.Count > 64000)
+                {
+                    CreateGameObject(kind, _meshes[kind], main.transform);
+                    _meshes[kind] = new MeshData();
                 }
-                //}
             }
+            //}
+

             foreach (var group in _meshes)
             {


* Increased initial tweeting from 400 to 600. The number of animations should be checked.

--- Assets/WatsonDev/ThirdParty/LeanTween/LeanTween.cs
+++ Assets/WatsonDev/ThirdParty/LeanTween/LeanTween.cs
@@ -1239,7 +1239,7 @@
 private static int[] tweensFinished;
 private static LTDescr tween;
 private static int tweenMaxSearch = -1;
-private static int maxTweens = 400;
+private static int maxTweens = 600;
 private static int frameRendered= -1;
 private static GameObject _tweenEmpty;
 private static float dtEstimated;


Each grid registers itself to the SandPanelWidgetPositioner

--- Sand.Controls/SandPanelWidgetGrid.cs
+++ Sand.Controls/SandPanelWidgetGrid.cs
@@ -155,6 +155,20 @@

         #endregion Properties
         //---------------------------------------------------------------------
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the SandPanelWidgetGrid class.
+        /// </summary>
+        public SandPanelWidgetGrid()
+        {
+            //-- Register this grid to the widget positioner in order to enable
+            //-- widget movements across different grids
+            SandPanelWidgetPositioner.RegisterGrid( this );
+        }
+
+        #endregion Constructors
+        //---------------------------------------------------------------------
         #region SandPanel Members

         public override void BeginInit()


* Added Assembly property to expose private assembly field of Module class.

git-svn-id: 2a3af8afa05c9a5b9366548807b65075bef6225b@119 7c140d53-a5f7-2844-acf0-7413b3fec49d

--- SerenityWeb/Trunk/Serenity/Module.cs
+++ SerenityWeb/Trunk/Serenity/Module.cs
@@ -37,10 +37,6 @@
         private string title;
         private ContentPage defaultPage;
         #endregion
-		#region Fields - Public
-		[ThreadStatic]
-		public static Module Current;
-		#endregion
 		#region Methods - Public
 		public static Module LoadModule(string name)
         {
@@ -157,6 +153,13 @@
 		}
         #endregion
         #region Properties - Public
+		public Assembly Assembly
+		{
+			get
+			{
+				return this.assembly;
+			}
+		}
 		public ContentPage DefaultPage
 		{
 			get


Fixed max port number

Fixed max port number

--- Server/Forms/FrmSettings.Designer.cs
+++ Server/Forms/FrmSettings.Designer.cs
@@ -74,7 +74,7 @@
             //
             this.ncPort.Location = new System.Drawing.Point(111, 7);
             this.ncPort.Maximum = new decimal(new int[] {
-            65534,
+            65535,
             0,
             0,
             0});