Switch from .NET 6.0 to 8.0, and update to Avalonia 11.1 (#413)

* Avalonia 11.1 beta1 * Update the WASM control catalog for Avalonia 11.1 / .NET 8.0 * Swap CI build from .NET 6/7 to 6/8 * Upgrade to .NET 8 * Switch the CI workfows to just use the .NET 8.0 SDK * Avalonia 11.1.0-beta2 * Switch to the inbox version of SourceLink * Try to fix AttachedEventDemo in .NET 8 * Avalonia 11.1.0-rc1 * Avalonia 11.1.0-rc2 * Avalonia 11.1.0 final --------- Co-authored-by: Fran Gonzalez <frgonz@microsoft.com>
fsprojects · Jul 23, 2024 · 580f09d · 580f09d
1 parent 2fc2dd7
commit 580f09d
Show file tree

Hide file tree

Showing 38 changed files with 39 additions and 48 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,8 +16,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.x.x
-          7.x.x
+          8.x.x
           
       
     - name: install workloads

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -19,8 +19,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.x.x
-          7.x.x
+          8.x.x
 
     - name: install workloads
       run: dotnet workload restore src/Avalonia.FuncUI.sln

diff --git a/src/Avalonia.FuncUI.Benchmarks/Avalonia.FuncUI.Benchmarks.fsproj b/src/Avalonia.FuncUI.Benchmarks/Avalonia.FuncUI.Benchmarks.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...alog/Avalonia.FuncUI.ControlCatalog.Browser/Avalonia.FuncUI.ControlCatalog.Browser.fsproj b/...alog/Avalonia.FuncUI.ControlCatalog.Browser/Avalonia.FuncUI.ControlCatalog.Browser.fsproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0-browser</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
+    <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+    <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="Properties\**" />
-    <None Include="AppBundle\**" />
-    <WasmExtraFilesToDeploy Include="AppBundle\**" />
+    <None Include="wwwroot\**" />
+    <WasmExtraFilesToDeploy Include="wwwroot\**" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ControlCatalog.Browser/AppBundle/Logo.svg → ...I.ControlCatalog.Browser/wwwroot/Logo.svg b/...ControlCatalog.Browser/AppBundle/Logo.svg → ...I.ControlCatalog.Browser/wwwroot/Logo.svg
diff --git a/....ControlCatalog.Browser/AppBundle/app.css → ...UI.ControlCatalog.Browser/wwwroot/app.css b/....ControlCatalog.Browser/AppBundle/app.css → ...UI.ControlCatalog.Browser/wwwroot/app.css
diff --git a/...trolCatalog.Browser/AppBundle/favicon.ico → ...ontrolCatalog.Browser/wwwroot/favicon.ico b/...trolCatalog.Browser/AppBundle/favicon.ico → ...ontrolCatalog.Browser/wwwroot/favicon.ico
diff --git a/...ntrolCatalog.Browser/AppBundle/index.html → ...ControlCatalog.Browser/wwwroot/index.html b/...ntrolCatalog.Browser/AppBundle/index.html → ...ControlCatalog.Browser/wwwroot/index.html
diff --git a/....ControlCatalog.Browser/AppBundle/main.js → ...UI.ControlCatalog.Browser/wwwroot/main.js b/....ControlCatalog.Browser/AppBundle/main.js → ...UI.ControlCatalog.Browser/wwwroot/main.js
@@ -1,4 +1,4 @@
-import { dotnet } from './dotnet.js'
+import { dotnet } from './_framework/dotnet.js'
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);
diff --git a/...alog/Avalonia.FuncUI.ControlCatalog.Desktop/Avalonia.FuncUI.ControlCatalog.Desktop.fsproj b/...alog/Avalonia.FuncUI.ControlCatalog.Desktop/Avalonia.FuncUI.ControlCatalog.Desktop.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...uncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj b/...uncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...onia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/AttachedEventDemo.fs b/...onia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/AttachedEventDemo.fs
@@ -38,7 +38,7 @@ module AttachedEventDemo =
         | :? 't as t when t.Name = name -> Some t
         | _ -> None
 
-    let sprintRoutedEvent (s: #Interactive) (e: #RoutedEventArgs) =
+    let sprintRoutedEvent (s: Interactive) (e: #RoutedEventArgs) =
         let time = System.DateTime.Now.ToString ("HH:mm:ss.fff")
 
         let sender =

diff --git a/src/Avalonia.FuncUI.Diagnostics/Avalonia.FuncUI.Diagnostics.fsproj b/src/Avalonia.FuncUI.Diagnostics/Avalonia.FuncUI.Diagnostics.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <WarnOn>3390;$(WarnOn)</WarnOn>
     </PropertyGroup>

diff --git a/src/Avalonia.FuncUI.Elmish/Avalonia.FuncUI.Elmish.fsproj b/src/Avalonia.FuncUI.Elmish/Avalonia.FuncUI.Elmish.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>$(FuncUIVersion)</Version>
     <Authors>JaggerJo</Authors>
     <Product>Avalonia.FuncUI.Elmish</Product>
@@ -33,10 +33,6 @@
 
   <ItemGroup>
     <PackageReference Include="Elmish" Version="4.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Avalonia.FuncUI.Templates/content/BasicMvuTemplate/BasicMvuTemplate.fsproj b/src/Avalonia.FuncUI.Templates/content/BasicMvuTemplate/BasicMvuTemplate.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Avalonia.FuncUI.Templates/content/BasicTemplate/BasicTemplate.fsproj b/src/Avalonia.FuncUI.Templates/content/BasicTemplate/BasicTemplate.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Avalonia.FuncUI.Templates/content/FullMvuTemplate/FullMvuTemplate.fsproj b/src/Avalonia.FuncUI.Templates/content/FullMvuTemplate/FullMvuTemplate.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Avalonia.FuncUI.Templates/content/FullTemplate/FullTemplate.fsproj b/src/Avalonia.FuncUI.Templates/content/FullTemplate/FullTemplate.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Avalonia.FuncUI.UnitTests/Avalonia.FuncUI.UnitTests.fsproj b/src/Avalonia.FuncUI.UnitTests/Avalonia.FuncUI.UnitTests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>

diff --git a/src/Avalonia.FuncUI/Avalonia.FuncUI.fsproj b/src/Avalonia.FuncUI/Avalonia.FuncUI.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>$(FuncUIVersion)</Version>
     <Authors>JaggerJo</Authors>
     <Product>Avalonia.FuncUI</Product>
@@ -26,10 +26,6 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0</AvaloniaVersion>
     <FuncUIVersion>1.4.0</FuncUIVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Examples/Component Examples/Examples.ChordParser/Examples.ChordParser.fsproj b/src/Examples/Component Examples/Examples.ChordParser/Examples.ChordParser.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <RootNamespace>Examples.ChordParser</RootNamespace>
   </PropertyGroup>

diff --git a/src/Examples/Component Examples/Examples.ContactBook/Examples.ContactBook.fsproj b/src/Examples/Component Examples/Examples.ContactBook/Examples.ContactBook.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <WarnOn>3390;$(WarnOn)</WarnOn>
     </PropertyGroup>
 

diff --git a/src/Examples/Component Examples/Examples.CounterApp/Examples.CounterApp.fsproj b/src/Examples/Component Examples/Examples.CounterApp/Examples.CounterApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.Components.CounterApp</RootNamespace>
         <PackageId>Examples.CounterApp</PackageId>
     </PropertyGroup>

diff --git a/src/Examples/Component Examples/Examples.DrawingApp/Examples.DrawingApp.fsproj b/src/Examples/Component Examples/Examples.DrawingApp/Examples.DrawingApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Examples/Component Examples/Examples.EnvApp/Examples.EnvApp.fsproj b/src/Examples/Component Examples/Examples.EnvApp/Examples.EnvApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Examples/Component Examples/Examples.GeneticAlgorithm/Examples.GeneticAlgorithm.fsproj b/src/Examples/Component Examples/Examples.GeneticAlgorithm/Examples.GeneticAlgorithm.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <WarnOn>3390;$(WarnOn)</WarnOn>
     </PropertyGroup>
 

diff --git a/src/Examples/Component Examples/Examples.InlineText/Examples.InlineText.fsproj b/src/Examples/Component Examples/Examples.InlineText/Examples.InlineText.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Examples/Component Examples/Examples.Presso/Examples.Presso.fsproj b/src/Examples/Component Examples/Examples.Presso/Examples.Presso.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Examples/Component Examples/Examples.TodoApp/Examples.TodoApp.fsproj b/src/Examples/Component Examples/Examples.TodoApp/Examples.TodoApp.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.ClockApp/Examples.Elmish.ClockApp.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.ClockApp/Examples.Elmish.ClockApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.ClockApp</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.CounterApp/Examples.Elmish.CounterApp.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.CounterApp/Examples.Elmish.CounterApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.CounterApp</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.GameOfLife/Examples.Elmish.GameOfLife.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.GameOfLife/Examples.Elmish.GameOfLife.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.GameOfLife</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.MusicPlayer/Examples.Elmish.MusicPlayer.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.MusicPlayer/Examples.Elmish.MusicPlayer.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.MusicPlayer</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.Presso/Examples.Elmish.Presso.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.Presso/Examples.Elmish.Presso.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Examples.Presso</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Examples/Elmish Examples/Examples.Elmish.Tetris/Examples.Elmish.Tetris.fsproj b/src/Examples/Elmish Examples/Examples.Elmish.Tetris/Examples.Elmish.Tetris.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Examples.Tetris</RootNamespace>
   </PropertyGroup>
 

diff --git a/src/Examples/Examples.DataGridPlayground/Examples.DataGridPlayground.fsproj b/src/Examples/Examples.DataGridPlayground/Examples.DataGridPlayground.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...ples/Examples.ViewModelComponent.CounterApp/Examples.ViewModelComponent.CounterApp.fsproj b/...ples/Examples.ViewModelComponent.CounterApp/Examples.ViewModelComponent.CounterApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,7 @@ jobs: @@
           uses: actions/setup-dotnet@v4
           with:
             dotnet-version: |
-.x.x
-.x.x
+.x.x
         - name: install workloads
@@ Expand Down @@