update to 0.10 avalonia.

danwalmsley · danwalmsley · commit 6ff00d80c0cc · 2021-04-07T13:07:06.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "request": "launch",
             //"preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceRoot}/AvalonStudio/AvalonStudio/bin/Debug/netcoreapp2.2/AvalonStudio.dll",
+            "program": "${workspaceRoot}/AvalonStudio/AvalonStudio/bin/Debug/net5.0/AvalonStudio.dll",
             "args": [],
             "cwd": "${workspaceRoot}/AvalonStudio/AvalonStudio",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
diff --git a/AvalonStudio.Shell b/AvalonStudio.Shell
@@ -1 +1 @@
-Subproject commit ca0982b18c3b9b6f215cc8d76cd6199b8229e526
+Subproject commit 01695b95b9e16f18e0d923f67d34e44d3cdb842d
diff --git a/AvalonStudio.TerminalEmulator b/AvalonStudio.TerminalEmulator
@@ -1 +1 @@
-Subproject commit 7db9db52911165cf3c8c75df3bff1d205cdd2856
+Subproject commit c8ad965266185d6919cb0489b23401fcdd947ef7
diff --git a/AvalonStudio/AvalonStudio.Controls.Editor/CodeEditor.cs b/AvalonStudio/AvalonStudio.Controls.Editor/CodeEditor.cs
@@ -285,17 +285,17 @@ void tunneledKeyDownHandler(object send, KeyEventArgs ee)
             {
                 if (s.Sender == this)
                 {
-                    if (s.OldValue != null)
+                    if (s.OldValue.Value != null)
                     {
-                        foreach (var renderer in (ObservableCollection<IBackgroundRenderer>)s.OldValue)
+                        foreach (var renderer in s.OldValue.Value)
                         {
                             TextArea.TextView.BackgroundRenderers.Remove(renderer);
                         }
                     }
 
-                    if (s.NewValue != null)
+                    if (s.NewValue.Value != null)
                     {
-                        foreach (var renderer in (ObservableCollection<IBackgroundRenderer>)s.NewValue)
+                        foreach (var renderer in s.NewValue.Value)
                         {
                             TextArea.TextView.BackgroundRenderers.Add(renderer);
                         }
@@ -307,17 +307,17 @@ void tunneledKeyDownHandler(object send, KeyEventArgs ee)
             {
                 if (s.Sender == this)
                 {
-                    if (s.OldValue != null)
+                    if (s.OldValue.Value != null)
                     {
-                        foreach (var renderer in (ObservableCollection<IVisualLineTransformer>)s.OldValue)
+                        foreach (var renderer in s.OldValue.Value)
                         {
                             TextArea.TextView.LineTransformers.Remove(renderer);
                         }
                     }
 
-                    if (s.NewValue != null)
+                    if (s.NewValue.Value != null)
                     {
-                        foreach (var renderer in (ObservableCollection<IVisualLineTransformer>)s.NewValue)
+                        foreach (var renderer in s.NewValue.Value)
                         {
                             TextArea.TextView.LineTransformers.Add(renderer);
                         }
diff --git a/AvalonStudio/AvalonStudio.Controls.Standard/AvalonStudio.Controls.Standard.csproj b/AvalonStudio/AvalonStudio.Controls.Standard/AvalonStudio.Controls.Standard.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" />
     <PackageReference Include="Avalonia.Controls.DataGrid" />
-    <PackageReference Include="DynamicData" Version="6.16.2" />
+    <PackageReference Include="DynamicData" Version="7.1.1" />
     <PackageReference Include="GitInfo" Version="2.0.20">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/AvalonStudio/AvalonStudio.Languages.Xaml/AvalonStudio.Languages.Xaml.csproj b/AvalonStudio/AvalonStudio.Languages.Xaml/AvalonStudio.Languages.Xaml.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <TieredCompilation>True</TieredCompilation>
   </PropertyGroup>
diff --git a/AvalonStudio/AvalonStudio.Projects.OmniSharp/AvalonStudio.Projects.OmniSharp.csproj b/AvalonStudio/AvalonStudio.Projects.OmniSharp/AvalonStudio.Projects.OmniSharp.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.CodeAnalysis.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="RestSharp.NetCore" Version="105.2.4-rc4-24214-01" />
+    <PackageReference Include="RestSharp" Version="106.11.7" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
   </ItemGroup>
diff --git a/AvalonStudio/AvalonStudio.Windows.Installer/AvalonStudio.Installer.wixproj b/AvalonStudio/AvalonStudio.Windows.Installer/AvalonStudio.Installer.wixproj
@@ -74,13 +74,13 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <Target Name="BeforeBuild">
-    <Exec Command="dotnet publish ..\AvalonStudio\AvalonStudio.csproj -c $(Configuration) -f netcoreapp3.0 -r win7-x64" />
-    <Exec Command="dotnet publish ..\AvalonStudioBuild\AvalonStudioBuild.csproj -c $(Configuration) -f netcoreapp3.0 -r win7-x64" />
-    <GetAssemblyIdentity AssemblyFiles="..\AvalonStudio\bin\$(Configuration)\netcoreapp3.0\win7-x64\AvalonStudio.dll">
+    <Exec Command="dotnet publish ..\AvalonStudio\AvalonStudio.csproj -c $(Configuration) -f net5.0 -r win7-x64" />
+    <Exec Command="dotnet publish ..\AvalonStudioBuild\AvalonStudioBuild.csproj -c $(Configuration) -f net5.0 -r win7-x64" />
+    <GetAssemblyIdentity AssemblyFiles="..\AvalonStudio\bin\$(Configuration)\net5.0\win7-x64\AvalonStudio.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
     </GetAssemblyIdentity>
     <PropertyGroup>
-      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePathAS=..\AvalonStudio\bin\$(Configuration)\netcoreapp3.0\win7-x64\publish;BasePathAB=..\AvalonStudioBuild\bin\$(Configuration)\netcoreapp3.0\win7-x64\publish</DefineConstants>
+      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePathAS=..\AvalonStudio\bin\$(Configuration)\net5.0\win7-x64\publish;BasePathAB=..\AvalonStudioBuild\bin\$(Configuration)\net5.0\win7-x64\publish</DefineConstants>
     </PropertyGroup>
     <HeatDirectory OutputFile="ComponentsGeneratedAS.wxs" PreprocessorVariable="var.BasePathAS" DirectoryRefId="INSTALLASFOLDER" ComponentGroupName="PublishedComponentsAS" SuppressCom="True" Directory="..\AvalonStudio\bin\$(Configuration)\netcoreapp3.0\win7-x64\publish" SuppressFragments="True" SuppressRegistry="True" SuppressRootDirectory="True" AutoGenerateGuids="False" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" />
     <HeatDirectory OutputFile="ComponentsGeneratedASB.wxs" PreprocessorVariable="var.BasePathAB" DirectoryRefId="INSTALLABFOLDER" ComponentGroupName="PublishedComponentsAB" SuppressCom="True" Directory="..\AvalonStudioBuild\bin\$(Configuration)\netcoreapp3.0\win7-x64\publish" SuppressFragments="True" SuppressRegistry="True" SuppressRootDirectory="True" AutoGenerateGuids="False" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" />
diff --git a/AvalonStudio/AvalonStudio/App.paml b/AvalonStudio/AvalonStudio/App.paml
@@ -22,8 +22,7 @@
     <StyleInclude Source="avares://AvalonStudio.Debugging/Icons/Icons.xaml" />
     <StyleInclude Source="avares://AvalonStudio.Controls.Standard/SolutionExplorer/Icons/Icons.xaml" />
     <StyleInclude Source="avares://AvalonStudio.Languages.Xaml/AvaloniaPreviewer.xaml" />
-    <StyleInclude Source="avares://Dock.Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Dock.Avalonia.Themes.Metro/DefaultTheme.xaml"/>
+    <StyleInclude Source="avares://Dock.Avalonia.Themes.Default/DefaultTheme.axaml"/>
     <StyleInclude Source="avares://VtNetCore.Avalonia/VirtualTerminalControl.xaml" />
 
     <Style Selector="shell|MetroWindow /template/ Button#minimiseButton">
diff --git a/AvalonStudio/AvalonStudio/AvalonStudio.csproj b/AvalonStudio/AvalonStudio/AvalonStudio.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <TieredCompilations>True</TieredCompilations>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -24,7 +24,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Reflection.Emit" Version="4.6.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageReference Include="Mono.Cecil" Version="0.10.3" />
     <PackageReference Include="Avalonia.X11" />
     <PackageReference Include="Avalonia.Desktop" />
@@ -37,10 +37,9 @@
     <PackageReference Include="System.Composition" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />    
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />    
     <PackageReference Include="Avalonia" />
     <PackageReference Include="Dock.Avalonia.Themes.Default" />
-    <PackageReference Include="Dock.Avalonia.Themes.Metro" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AvalonStudio/AvalonStudioBuild/AvalonStudioBuild.csproj b/AvalonStudio/AvalonStudioBuild/AvalonStudioBuild.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <AssemblyName>avalon</AssemblyName>
     <TieredCompilation>True</TieredCompilation>
     <PreserveCompilationContext>true</PreserveCompilationContext>
diff --git a/AvalonStudio/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/AvalonStudio/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <TieredCompilation>True</TieredCompilation>
   </PropertyGroup>
diff --git a/AvalonStudio/Avalonia.Ide b/AvalonStudio/Avalonia.Ide
@@ -1 +1 @@
-Subproject commit 94eefb5241591421d68ca357f678f0aa86acacfb
+Subproject commit 88d5e6e8a1933b100d4b950757db395572f84b16
diff --git a/AvaloniaEdit b/AvaloniaEdit
@@ -1 +1 @@
-Subproject commit 7bb4734611be0323d0929af53aad6a001a112ce2
+Subproject commit 57774017d146456efc1d6eef71840fa1561186ca
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,13 +1,13 @@
 <Project>
 
   <PropertyGroup>
-    <AvaloniaBehaviorsVersion>0.10.0-preview3</AvaloniaBehaviorsVersion>
-    <AvaloniaVersion>0.10.0-preview3</AvaloniaVersion>
-    <DockVersion>0.10.0-preview3</DockVersion>
+    <AvaloniaBehaviorsVersion>0.10.0</AvaloniaBehaviorsVersion>
+    <AvaloniaVersion>0.10.0</AvaloniaVersion>
+    <DockVersion>0.10.0</DockVersion>
     <GitInfoVersion>2.0.20</GitInfoVersion>
     <MicrosoftExtensionsDependencyModelVersion>2.0.4</MicrosoftExtensionsDependencyModelVersion>
     <NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
-    <ReactiveUIVersion>11.5.17</ReactiveUIVersion>
+    <ReactiveUIVersion>12.1.1</ReactiveUIVersion>
     <RoslynVersion>3.6.0</RoslynVersion>
     <SystemCompositionVersion>1.0.31</SystemCompositionVersion>
     <SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
@@ -48,7 +48,6 @@
     <PackageReference Update="Dock.Avalonia" Version="$(DockVersion)" />
     <PackageReference Update="Dock.Model.ReactiveUI" Version="$(DockVersion)" />
     <PackageReference Update="Dock.Avalonia.Themes.Default" Version="$(DockVersion)" />
-    <PackageReference Update="Dock.Avalonia.Themes.Metro" Version="$(DockVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/nuget.config b/nuget.config
@@ -7,8 +7,6 @@
     <add key="XamlBehaviors" value="https://www.myget.org/F/xamlbehaviors-nightly/api/v2" />
     <add key="sharpgen" value="https://www.myget.org/F/sharpgentools/api/v3/index.json" />
     <add key="cli-deps" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="netcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="Roslyn Nightlies" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     <add key="DockNightly" value="https://www.myget.org/F/dock-nightly/api/v2" />
   </packageSources>
 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -285,17 +285,17 @@ void tunneledKeyDownHandler(object send, KeyEventArgs ee)`
`285`	`285`	`{`
`286`	`286`	`if (s.Sender == this)`
`287`	`287`	`{`
`288`		`- if (s.OldValue != null)`
	`288`	`+ if (s.OldValue.Value != null)`
`289`	`289`	`{`
`290`		`- foreach (var renderer in (ObservableCollection<IBackgroundRenderer>)s.OldValue)`
	`290`	`+ foreach (var renderer in s.OldValue.Value)`
`291`	`291`	`{`
`292`	`292`	`TextArea.TextView.BackgroundRenderers.Remove(renderer);`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`- if (s.NewValue != null)`
	`296`	`+ if (s.NewValue.Value != null)`
`297`	`297`	`{`
`298`		`- foreach (var renderer in (ObservableCollection<IBackgroundRenderer>)s.NewValue)`
	`298`	`+ foreach (var renderer in s.NewValue.Value)`
`299`	`299`	`{`
`300`	`300`	`TextArea.TextView.BackgroundRenderers.Add(renderer);`
`301`	`301`	`}`
`@@ -307,17 +307,17 @@ void tunneledKeyDownHandler(object send, KeyEventArgs ee)`
`307`	`307`	`{`
`308`	`308`	`if (s.Sender == this)`
`309`	`309`	`{`
`310`		`- if (s.OldValue != null)`
	`310`	`+ if (s.OldValue.Value != null)`
`311`	`311`	`{`
`312`		`- foreach (var renderer in (ObservableCollection<IVisualLineTransformer>)s.OldValue)`
	`312`	`+ foreach (var renderer in s.OldValue.Value)`
`313`	`313`	`{`
`314`	`314`	`TextArea.TextView.LineTransformers.Remove(renderer);`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`
`318`		`- if (s.NewValue != null)`
	`318`	`+ if (s.NewValue.Value != null)`
`319`	`319`	`{`
`320`		`- foreach (var renderer in (ObservableCollection<IVisualLineTransformer>)s.NewValue)`
	`320`	`+ foreach (var renderer in s.NewValue.Value)`
`321`	`321`	`{`
`322`	`322`	`TextArea.TextView.LineTransformers.Add(renderer);`
`323`	`323`	`}`