Browse Source

Minor changes

Max Katz 2 years ago
parent
commit
44c385c314

+ 1 - 1
src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs

@@ -127,7 +127,7 @@ namespace Avalonia.Build.Tasks
 
         public bool Execute()
         {
-            Enum.TryParse<MessageImportance>(ReportImportance, out _reportImportance);
+            Enum.TryParse(ReportImportance, true, out _reportImportance);
 
             BuildEngine.LogMessage($"GenerateAvaloniaResourcesTask -> Root: {Root}, {Resources?.Count()} resources, Output:{Output}", _reportImportance < MessageImportance.Low ? MessageImportance.High : _reportImportance);
             var resources = BuildResourceSources();

+ 1 - 1
src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@@ -352,7 +352,7 @@ namespace Avalonia.Build.Tasks
 
                         ((List<XamlDocumentResource>)parsedXamlDocuments).Add(new XamlDocumentResource(
                             parsed, res.Uri, res, classType,
-                            classModifierPublic ?? true,
+                            classModifierPublic.Value,
                             populateBuilder,
                             compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
                                 classTypeDefinition == null && classModifierPublic.Value),

+ 0 - 2
src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <!-- NativeMenuBar uses ReflectionBinding -->
-    <NoWarn>$(NoWarn);IL2026</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />

+ 0 - 2
src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <!-- NativeMenuBar uses ReflectionBinding -->
-    <NoWarn>$(NoWarn);IL2026</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />