Merge branch 'master' into fixes/Benchmarks-Project

azure-pipelines-integrationtests.yml

@@ -12,6 +12,16 @@ jobs:
     name: 'AvaloniaMacPool'
 
   steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 6.0.401'
+    inputs:
+      version: 6.0.401
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 7.0.100-rc.2.22477.23'
+    inputs:
+      version: 7.0.100-rc.2.22477.23
+      
   - script: system_profiler SPDisplaysDataType |grep Resolution
   
   - script: |
@@ -45,6 +55,11 @@ jobs:
     inputs:
       version: 6.0.401
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 7.0.100-rc.2.22477.23'
+    inputs:
+      version: 7.0.100-rc.2.22477.23
+
   - task: Windows Application Driver@0
     inputs:
       OperationType: 'Start'

azure-pipelines.yml

@@ -35,9 +35,9 @@ jobs:
       version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100-rc.1.22431.12'
+    displayName: 'Use .NET Core SDK 7.0.100-rc.2.22477.23'
     inputs:
-      version: 7.0.100-rc.1.22431.12
+      version: 7.0.100-rc.2.22477.23
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -72,9 +72,9 @@ jobs:
       version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100-rc.1.22431.12'
+    displayName: 'Use .NET Core SDK 7.0.100-rc.2.22477.23'
     inputs:
-      version: 7.0.100-rc.1.22431.12
+      version: 7.0.100-rc.2.22477.23
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -143,9 +143,9 @@ jobs:
       version: 6.0.401
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.100-rc.1.22431.12'
+    displayName: 'Use .NET Core SDK 7.0.100-rc.2.22477.23'
     inputs:
-      version: 7.0.100-rc.1.22431.12
+      version: 7.0.100-rc.2.22477.23
 
   - task: CmdLine@2
     displayName: 'Install Workloads'

global.json

@@ -1,4 +1,8 @@
 {
+    "sdk": {
+        "version": "7.0.100-rc.2.22477.23",
+        "rollForward": "latestFeature"
+    },
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
         "MSBuild.Sdk.Extras": "3.0.22",

packages/Avalonia/AvaloniaBuildTasks.targets

@@ -3,7 +3,6 @@
     <_AvaloniaUseExternalMSBuild>$(AvaloniaUseExternalMSBuild)</_AvaloniaUseExternalMSBuild>
     <_AvaloniaUseExternalMSBuild Condition="'$(_AvaloniaForceInternalMSBuild)' == 'true'">false</_AvaloniaUseExternalMSBuild>
     <AvaloniaXamlReportImportance Condition="'$(AvaloniaXamlReportImportance)' == ''">low</AvaloniaXamlReportImportance>
-    <_AvaloniaPatchComInterop Condition="'$(_AvaloniaPatchComInterop)' == ''">false</_AvaloniaPatchComInterop>
     <_AvaloniaSkipXamlCompilation Condition="'$(_AvaloniaSkipXamlCompilation)' == ''">false</_AvaloniaSkipXamlCompilation>
   </PropertyGroup>
 
@@ -71,7 +70,6 @@
       Output="$(AvaloniaResourcesTemporaryFilePath)"
       Root="$(MSBuildProjectDirectory)"
       Resources="@(AvaloniaResource)"
-      EmbeddedResources="@(EmbeddedResources)"
       ReportImportance="$(AvaloniaXamlReportImportance)"/>
     <Exec 
       Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
@@ -106,7 +104,6 @@
       AssemblyOriginatorKeyFile="$(AssemblyOriginatorKeyFile)"
       SignAssembly="$(SignAssembly)"
       DelaySign="$(DelaySign)"
-      EnableComInteropPatching="$(_AvaloniaPatchComInterop)"
       SkipXamlCompilation="$(_AvaloniaSkipXamlCompilation)"
       DebuggerLaunch="$(AvaloniaXamlIlDebuggerLaunch)"
     />

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunNativeAotCompilation)' == 'true'">

src/Avalonia.Base/Utilities/IdentifierParser.cs

@@ -8,7 +8,7 @@ namespace Avalonia.Utilities
 #endif
     static class IdentifierParser
     {
-        public static ReadOnlySpan<char> ParseIdentifier(this ref CharacterReader r)
+        public static ReadOnlySpan<char> ParseIdentifier(this scoped ref CharacterReader r)
         {
             if (IsValidIdentifierStart(r.Peek))
             {

src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs

@@ -37,8 +37,7 @@ namespace Avalonia.Build.Tasks
             var res = XamlCompilerTaskExecutor.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
                 ProjectDirectory, OutputPath, VerifyIl, outputImportance,
-                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null,
-                EnableComInteropPatching, SkipXamlCompilation, DebuggerLaunch);
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null, SkipXamlCompilation, DebuggerLaunch);
             if (!res.Success)
                 return false;
             if (!res.WrittenFile)
@@ -72,8 +71,6 @@ namespace Avalonia.Build.Tasks
         public string OutputPath { get; set; }
 
         public bool VerifyIl { get; set; }
-        
-        public bool EnableComInteropPatching { get; set; }
         public bool SkipXamlCompilation { get; set; }
         
         public string AssemblyOriginatorKeyFile { get; set; }

src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs

@@ -18,8 +18,6 @@ namespace Avalonia.Build.Tasks
         public string Root { get; set; }
         [Required]
         public string Output { get; set; }
-        [Required]
-        public ITaskItem[] EmbeddedResources { get; set; }
 
         public string ReportImportance { get; set; }
 
@@ -148,10 +146,6 @@ namespace Avalonia.Build.Tasks
             Enum.TryParse<MessageImportance>(ReportImportance, out _reportImportance);
 
             BuildEngine.LogMessage($"GenerateAvaloniaResourcesTask -> Root: {Root}, {Resources?.Count()} resources, Output:{Output}", _reportImportance < MessageImportance.Low ? MessageImportance.High : _reportImportance);
-
-            foreach (var r in EmbeddedResources.Where(r => r.ItemSpec.EndsWith(".xaml") || r.ItemSpec.EndsWith(".paml") || r.ItemSpec.EndsWith(".axaml")))
-                BuildEngine.LogWarning(BuildEngineErrorCode.LegacyResmScheme, r.ItemSpec,
-                    "XAML file is packed using legacy EmbeddedResource/resm scheme, relative URIs won't work");
             var resources = BuildResourceSources();
 
             if (!PreProcessXamlFiles(resources))

src/Avalonia.Build.Tasks/Program.cs

@@ -44,8 +44,7 @@ namespace Avalonia.Build.Tasks
                 OutputPath = args[2],
                 BuildEngine = new ConsoleBuildEngine(),
                 ProjectDirectory = Directory.GetCurrentDirectory(),
-                VerifyIl = true,
-                EnableComInteropPatching = true
+                VerifyIl = true
             }.Execute() ?
                 0 :
                 2;

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

@@ -24,38 +24,6 @@ namespace Avalonia.Build.Tasks
             string Name { get; }
             IEnumerable<IResource> Resources { get; }
         }
-        
-        class EmbeddedResources : IResourceGroup
-        {
-            private readonly AssemblyDefinition _asm;
-            public string Name => "EmbeddedResource";
-
-            public IEnumerable<IResource> Resources => _asm.MainModule.Resources.OfType<EmbeddedResource>()
-                .Select(r => new WrappedResource(_asm, r)).ToList();
-
-            public EmbeddedResources(AssemblyDefinition asm)
-            {
-                _asm = asm;
-            }
-            class WrappedResource : IResource
-            {
-                private readonly AssemblyDefinition _asm;
-                private readonly EmbeddedResource _res;
-
-                public WrappedResource(AssemblyDefinition asm, EmbeddedResource res)
-                {
-                    _asm = asm;
-                    _res = res;
-                }
-
-                public string Uri => $"resm:{Name}?assembly={_asm.Name.Name}";
-                public string Name => _res.Name;
-                public string FilePath => Name;
-                public byte[] FileContents => _res.GetResourceData();
-
-                public void Remove() => _asm.MainModule.Resources.Remove(_res);
-            }
-        }
 
         class AvaloniaResources : IResourceGroup
         {

src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@@ -39,15 +39,15 @@ namespace Avalonia.Build.Tasks
 
         public static CompileResult Compile(IBuildEngine engine, string input, string[] references,
             string projectDirectory,
-            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool patchCom,
+            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey,
             bool skipXamlCompilation)
         {
-            return Compile(engine, input, references, projectDirectory, output, verifyIl, logImportance, strongNameKey, patchCom, skipXamlCompilation, debuggerLaunch:false);
+            return Compile(engine, input, references, projectDirectory, output, verifyIl, logImportance, strongNameKey, skipXamlCompilation, debuggerLaunch:false);
         }
 
         internal static CompileResult Compile(IBuildEngine engine, string input, string[] references,
             string projectDirectory,
-            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool patchCom, bool skipXamlCompilation, bool debuggerLaunch)
+            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool skipXamlCompilation, bool debuggerLaunch)
         {
             var typeSystem = new CecilTypeSystem(
                 references.Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll")),
@@ -58,15 +58,12 @@ namespace Avalonia.Build.Tasks
             if (!skipXamlCompilation)
             {
                 var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, logImportance, debuggerLaunch);
-                if (compileRes == null && !patchCom)
+                if (compileRes == null)
                     return new CompileResult(true);
                 if (compileRes == false)
                     return new CompileResult(false);
             }
 
-            if (patchCom)
-                ComInteropHelper.PatchAssembly(asm, typeSystem);
-
             var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
             if (!string.IsNullOrWhiteSpace(strongNameKey))
                 writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
@@ -112,9 +109,8 @@ namespace Avalonia.Build.Tasks
                 }
             }
             var asm = typeSystem.TargetAssemblyDefinition;
-            var emres = new EmbeddedResources(asm);
             var avares = new AvaloniaResources(asm, projectDirectory);
-            if (avares.Resources.Count(CheckXamlName) == 0 && emres.Resources.Count(CheckXamlName) == 0)
+            if (avares.Resources.Count(CheckXamlName) == 0)
                 // Nothing to do
                 return null;
 
@@ -436,9 +432,6 @@ namespace Avalonia.Build.Tasks
                 return true;
             }
             
-            if (emres.Resources.Count(CheckXamlName) != 0)
-                if (!CompileGroup(emres))
-                    return false;
             if (avares.Resources.Count(CheckXamlName) != 0)
             {
                 if (!CompileGroup(avares))

src/Avalonia.MicroCom/Avalonia.MicroCom.csproj

@@ -3,9 +3,6 @@
       <TargetFramework>netstandard2.0</TargetFramework>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup>
-    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj

@@ -5,7 +5,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>Avalonia.Markup.Xaml.Loader</PackageId>
     <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
-    <LangVersion>10</LangVersion>
+    <LangVersion>11</LangVersion>
   </PropertyGroup>
   <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
   <PropertyGroup>

src/Markup/Avalonia.Markup/Avalonia.Markup.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <RootNamespace>Avalonia</RootNamespace>
+    <LangVersion>11</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Markup\Parsers\Nodes\ExpressionGrammer" />

src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs

@@ -168,7 +168,7 @@ namespace Avalonia.Markup.Parsers
             }
         }
 
-        private static State ParseAttachedProperty(ref CharacterReader r, List<INode> nodes)
+        private static State ParseAttachedProperty(scoped ref CharacterReader r, List<INode> nodes)
         {
             var (ns, owner) = ParseTypeName(ref r);
 
@@ -318,7 +318,7 @@ namespace Avalonia.Markup.Parsers
             return State.AfterMember;
         }
 
-        private static TypeName ParseTypeName(ref CharacterReader r)
+        private static TypeName ParseTypeName(scoped ref CharacterReader r)
         {
             ReadOnlySpan<char> ns, typeName;
             ns = ReadOnlySpan<char>.Empty;

tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj

@@ -8,9 +8,9 @@
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="**\*.xaml">
+    <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </AvaloniaResource>
   </ItemGroup>
 
   <ItemGroup>

tests/Directory.Build.props

@@ -0,0 +1,6 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>