From 4043c6aa665c38d0ee4b6564b9ec5743ee4d4c8e Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 16 Nov 2022 21:44:32 -0500 Subject: [PATCH] Minor formatting issues --- .../XamlCompilerTaskExecutor.cs | 40 +++++++++---------- src/Avalonia.Themes.Fluent/FluentTheme.xaml | 2 +- src/Avalonia.Themes.Simple/SimpleTheme.xaml | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs index e68cb0013a..75abfe352f 100644 --- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs +++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs @@ -57,40 +57,40 @@ namespace Avalonia.Build.Tasks { try { - references = references.Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll")).ToArray(); - var typeSystem = new CecilTypeSystem(references, input); - var refTypeSystem = !string.IsNullOrWhiteSpace(refInput) && File.Exists(refInput) ? new CecilTypeSystem(references, refInput) : null; - - var asm = typeSystem.TargetAssemblyDefinition; - var refAsm = refTypeSystem?.TargetAssemblyDefinition; - if (!skipXamlCompilation) - { + references = references.Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll")).ToArray(); + var typeSystem = new CecilTypeSystem(references, input); + var refTypeSystem = !string.IsNullOrWhiteSpace(refInput) && File.Exists(refInput) ? new CecilTypeSystem(references, refInput) : null; + + var asm = typeSystem.TargetAssemblyDefinition; + var refAsm = refTypeSystem?.TargetAssemblyDefinition; + if (!skipXamlCompilation) + { var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, defaultCompileBindings, logImportance, debuggerLaunch); if (compileRes == null) return new CompileResult(true); if (compileRes == false) return new CompileResult(false); - + if (refTypeSystem is not null) { var refCompileRes = CompileCoreForRefAssembly(engine, typeSystem, refTypeSystem); if (refCompileRes == false) return new CompileResult(false); } - } + } - var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols }; - if (!string.IsNullOrWhiteSpace(strongNameKey)) + var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols }; + if (!string.IsNullOrWhiteSpace(strongNameKey)) writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey); - - asm.Write(output, writerParameters); - - var refWriterParameters = new WriterParameters { WriteSymbols = false }; - if (!string.IsNullOrWhiteSpace(strongNameKey)) + + asm.Write(output, writerParameters); + + var refWriterParameters = new WriterParameters { WriteSymbols = false }; + if (!string.IsNullOrWhiteSpace(strongNameKey)) writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey); - refAsm?.Write(refOutput, refWriterParameters); - - return new CompileResult(true, true); + refAsm?.Write(refOutput, refWriterParameters); + + return new CompileResult(true, true); } catch (Exception ex) { diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml index 1d710bb9dc..d8f8267fe5 100644 --- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml +++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml @@ -8,7 +8,7 @@ - + diff --git a/src/Avalonia.Themes.Simple/SimpleTheme.xaml b/src/Avalonia.Themes.Simple/SimpleTheme.xaml index c8bf748595..fe296bd288 100644 --- a/src/Avalonia.Themes.Simple/SimpleTheme.xaml +++ b/src/Avalonia.Themes.Simple/SimpleTheme.xaml @@ -7,7 +7,7 @@ - +