update nuget packages

PieroCastillo · Jan 25, 2024 · 94054a2 · 94054a2
1 parent 8d0aaee
commit 94054a2
Show file tree

Hide file tree

Showing 35 changed files with 65 additions and 928 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/Aura.UI.sln b/Aura.UI.sln
@@ -9,11 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aura.UI", "src\Aura.UI\Aura
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{42648CDA-16AC-4D09-8480-CA6600A1CF6D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0F84999C-70F6-4D29-A4A5-D2D25336C0CB}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3AF1E581-2ACF-4F42-BC10-12BACF221499}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{49979C88-3FF5-4FC9-99D7-E1BCB0F9D23A}"
@@ -23,18 +18,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{49979C88
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aura.UI.Gallery", "samples\Aura.UI.Gallery\Aura.UI.Gallery.csproj", "{1426BB67-00C8-4438-866F-B8F8F1F017E8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "snippets", "snippets", "{0CC59F23-101A-4E16-8E44-F6F0A3FFF6A5}"
-	ProjectSection(SolutionItems) = preProject
-		DirectPropertySnippet.snippet = DirectPropertySnippet.snippet
-		StyledPropertySnippet.snippet = StyledPropertySnippet.snippet
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aura.UI.FluentTheme", "src\Aura.UI.FluentTheme\Aura.UI.FluentTheme.csproj", "{AE82DFE7-FEE5-4A06-B195-95E7E2579306}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathsForUI.Test", "Tests\MathsForUI.Test\MathsForUI.Test.csproj", "{6082C42D-7828-4771-86EA-F7DC9623B401}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniSample", "samples\MiniSample\MiniSample.csproj", "{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MVVMSamples", "MVVMSamples", "{9B4AF7D2-605C-4E69-901C-CF706E417951}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuraTabViewMVVMSample", "MVVMSamples\AuraTabViewMVVMSample\AuraTabViewMVVMSample.csproj", "{256CA0FF-8EE2-4774-8222-F9C922D04A75}"
@@ -157,30 +144,6 @@ Global
 		{6082C42D-7828-4771-86EA-F7DC9623B401}.Release|x64.Build.0 = Release|Any CPU
 		{6082C42D-7828-4771-86EA-F7DC9623B401}.Release|x86.ActiveCfg = Release|Any CPU
 		{6082C42D-7828-4771-86EA-F7DC9623B401}.Release|x86.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|x64.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|ARM.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|ARM.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|iPhone.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|x64.Build.0 = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4}.Release|x86.Build.0 = Release|Any CPU
 		{256CA0FF-8EE2-4774-8222-F9C922D04A75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{256CA0FF-8EE2-4774-8222-F9C922D04A75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{256CA0FF-8EE2-4774-8222-F9C922D04A75}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -286,7 +249,6 @@ Global
 		{1426BB67-00C8-4438-866F-B8F8F1F017E8} = {3AF1E581-2ACF-4F42-BC10-12BACF221499}
 		{AE82DFE7-FEE5-4A06-B195-95E7E2579306} = {E0772EFF-1A2A-466C-83C7-A81D93213336}
 		{6082C42D-7828-4771-86EA-F7DC9623B401} = {42648CDA-16AC-4D09-8480-CA6600A1CF6D}
-		{CFE5CF74-CA5A-4DF0-ACC4-2F80F2F676A4} = {3AF1E581-2ACF-4F42-BC10-12BACF221499}
 		{256CA0FF-8EE2-4774-8222-F9C922D04A75} = {9B4AF7D2-605C-4E69-901C-CF706E417951}
 		{CBBB0D12-B6FF-4BBB-BCEF-25607041482B} = {9B4AF7D2-605C-4E69-901C-CF706E417951}
 		{37F9F8D6-E8E8-4C41-8A84-A042A5AA4C67} = {3AF1E581-2ACF-4F42-BC10-12BACF221499}

diff --git a/DirectPropertySnippet.snippet b/DirectPropertySnippet.snippet
diff --git a/MVVMSamples/AuraTabViewMVVMSample/AuraTabViewMVVMSample.csproj b/MVVMSamples/AuraTabViewMVVMSample/AuraTabViewMVVMSample.csproj
@@ -10,11 +10,11 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+    <PackageReference Include="Avalonia" Version="11.0. 7" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Aura.UI.FluentTheme\Aura.UI.FluentTheme.csproj" />

diff --git a/MVVMSamples/AuraTabViewMVVMSample/ViewLocator.cs b/MVVMSamples/AuraTabViewMVVMSample/ViewLocator.cs
@@ -7,7 +7,7 @@ namespace AuraTabViewMVVMSample
 {
     public class ViewLocator : IDataTemplate
     {
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);

diff --git a/MVVMSamples/NavigationViewMVVMSample/NavigationViewMVVMSample.csproj b/MVVMSamples/NavigationViewMVVMSample/NavigationViewMVVMSample.csproj
@@ -10,11 +10,11 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+    <PackageReference Include="Avalonia" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Aura.UI.FluentTheme\Aura.UI.FluentTheme.csproj" />

diff --git a/MVVMSamples/NavigationViewMVVMSample/ViewLocator.cs b/MVVMSamples/NavigationViewMVVMSample/ViewLocator.cs
@@ -7,7 +7,7 @@ namespace NavigationViewMVVMSample
 {
     public class ViewLocator : IDataTemplate
     {
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);

diff --git a/StyledPropertySnippet.snippet b/StyledPropertySnippet.snippet
diff --git a/Tests/MathsForUI.Test/MathsForUI.Test.csproj b/Tests/MathsForUI.Test/MathsForUI.Test.csproj
@@ -1,26 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Aura.UI.Neumorphism\Aura.UI.Neumorphism.csproj" />
     <ProjectReference Include="..\..\src\Aura.UI\Aura.UI.csproj" />
   </ItemGroup>
 

diff --git a/samples/Aura.UI.Gallery.NetCore/Aura.UI.Gallery.NetCore.csproj b/samples/Aura.UI.Gallery.NetCore/Aura.UI.Gallery.NetCore.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Aura.UI.Gallery.NetCore</RootNamespace>
-    <AvaloniaVersion>0.10.11</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aura.UI.Gallery\Aura.UI.Gallery.csproj" />

diff --git a/samples/Aura.UI.Gallery.Web/Aura.UI.Gallery.Web.csproj b/samples/Aura.UI.Gallery.Web/Aura.UI.Gallery.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!--Temporal hack that fixes compilation in VS-->
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.7" PrivateAssets="all" />
-    <PackageReference Include="Avalonia.Web.Blazor" Version="0.10.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
+    <PackageReference Include="Avalonia.Web.Blazor" Version="0.10.22" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
@@ -46,14 +46,13 @@
     </AvaloniaXaml>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" PrivateAssets="all" />
     <PackageReference Include="AuraUtilities" Version="0.1.5.5" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.12.2" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Svg" Version="0.10.16" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Svg" Version="11.0.0.10" />
     <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Aura.UI.Gallery/ViewLocator.cs b/samples/Aura.UI.Gallery/ViewLocator.cs
@@ -9,7 +9,7 @@ public class ViewLocator : IDataTemplate
     {
         public bool SupportsRecycling => false;
 
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);