Merge pull request #9169 from AvaloniaUI/fixes/scoped-keyword-fixes

Fixes/scoped keyword fixes

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",

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/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;