Browse Source

Fix tests and fix ControlCatalog.iOS to not reference Sprache.

pull/1668/head
Jeremy Koritzinsky 8 years ago
parent
commit
7faf079961
  1. 3
      samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
  2. 1
      src/Avalonia.Base/Data/Core/ExpressionParseException.cs
  3. 4
      src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs

3
samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj

@ -174,6 +174,5 @@
<Name>ControlCatalog</Name> <Name>ControlCatalog</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\Sprache.props" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project> </Project>

1
src/Avalonia.Base/Data/Core/ExpressionParseException.cs

@ -17,6 +17,7 @@ namespace Avalonia.Data.Core
/// </summary> /// </summary>
/// <param name="column">The column position of the error.</param> /// <param name="column">The column position of the error.</param>
/// <param name="message">The exception message.</param> /// <param name="message">The exception message.</param>
/// <param name="innerException">The exception that caused the parsing failure.</param>
public ExpressionParseException(int column, string message, Exception innerException = null) public ExpressionParseException(int column, string message, Exception innerException = null)
: base(message, innerException) : base(message, innerException)
{ {

4
src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs

@ -216,11 +216,11 @@ namespace Avalonia.Markup.Parsers
{ {
var mode = r.ParseIdentifier(); var mode = r.ParseIdentifier();
if (mode == "self".AsSpan()) if (mode.Equals("self".AsSpan(), StringComparison.InvariantCulture))
{ {
nodes.Add(new SelfNode()); nodes.Add(new SelfNode());
} }
else if (mode == "parent".AsSpan()) else if (mode.Equals("parent".AsSpan(), StringComparison.InvariantCulture))
{ {
Type ancestorType = null; Type ancestorType = null;
var ancestorLevel = 0; var ancestorLevel = 0;

Loading…
Cancel
Save