Browse Source

Cleanup

pull/2322/head
Nikita Tsukanov 7 years ago
parent
commit
4b0f23a80e
  1. 2
      src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
  2. 9
      src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
  3. 4
      src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/README.md

2
src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@ -118,8 +118,6 @@ namespace Avalonia.Build.Tasks
foreach (var res in group.Resources.Where(CheckXamlName))
{
if(res.Name.Contains("DefaultTheme"))
Console.WriteLine();
try
{
// StreamReader is needed here to handle BOM

9
src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs

@ -133,14 +133,7 @@ namespace Avalonia.Markup.Xaml
using (var stream = asset.stream)
{
var absoluteUri = uri.IsAbsoluteUri ? uri : new Uri(baseUri, uri);
//try
{
return Load(stream, asset.assembly, rootInstance, absoluteUri);
}
//catch (Exception e)
{
//throw new XamlLoadException("Error loading xaml at " + absoluteUri + ": " + e.Message, e);
}
return Load(stream, asset.assembly, rootInstance, absoluteUri);
}
}

4
src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/README.md

@ -1,4 +0,0 @@
### Important
Only use XamlIl and netstandard types here since these sources will be later
used by MSBuild task
Loading…
Cancel
Save