From 47b37d78919290c48618d1b69699b6349e72d307 Mon Sep 17 00:00:00 2001 From: Rockford Lhotka Date: Sun, 2 Feb 2025 19:24:36 -0800 Subject: [PATCH 1/4] #3785 Update samples for rc4 --- .../BlazorExample/Directory.Packages.props | 8 ++--- .../BusinessRuleDemo/BusinessRuleDemo.csproj | 32 +++++++++++++------ .../BusinessRuleDemo/CalcSum.cs | 4 --- .../BusinessRuleDemo/LessThanProperty.cs | 4 --- .../BusinessRuleDemo/SetStateName.cs | 2 +- .../BusinessRuleDemo/StringRequiredIfUS.cs | 1 - .../BusinessRuleDemo/packages.config | 9 ++++-- Samples/CslaFastStart/CslaFastStart.sln | 9 ++++-- .../CslaFastStart/Directory.Packages.props | 2 +- Samples/CustomActivator/CustomActivator.sln | 9 ++++-- .../CustomActivator/Directory.Packages.props | 2 +- .../CustomErrorHandling.sln | 5 +++ .../Directory.Packages.props | 4 +-- .../CustomErrorHandling/WindowsUI/Program.cs | 2 +- .../DataPortalCacheExample.csproj | 6 ++-- .../DataPortalCacheExample/Program.cs | 2 +- .../DataPortalFactoryExample.csproj | 4 +-- 17 files changed, 64 insertions(+), 41 deletions(-) diff --git a/Samples/BlazorExample/Directory.Packages.props b/Samples/BlazorExample/Directory.Packages.props index d89f204c5f..f70ae17d1e 100644 --- a/Samples/BlazorExample/Directory.Packages.props +++ b/Samples/BlazorExample/Directory.Packages.props @@ -4,10 +4,10 @@ 9.0.0-alpha-g27c299cae5 - - - - + + + + diff --git a/Samples/BusinessRuleDemo/BusinessRuleDemo/BusinessRuleDemo.csproj b/Samples/BusinessRuleDemo/BusinessRuleDemo/BusinessRuleDemo.csproj index 2a128957ca..9df74be6df 100644 --- a/Samples/BusinessRuleDemo/BusinessRuleDemo/BusinessRuleDemo.csproj +++ b/Samples/BusinessRuleDemo/BusinessRuleDemo/BusinessRuleDemo.csproj @@ -40,12 +40,14 @@ false - - ..\packages\Csla.8.0.0\lib\net48\Csla.dll - True + + ..\packages\Backport.System.Threading.Lock.3.1.0\lib\net45\Backport.System.Threading.Lock.dll + + + ..\packages\Csla.9.0.0-rc4-gc005a93a3c\lib\net48\Csla.dll - - ..\packages\Csla.Windows.Forms.8.0.0-R24021201\lib\net462\Csla.Windows.dll + + ..\packages\Csla.Windows.Forms.9.0.0-rc4-gc005a93a3c\lib\net462\Csla.Windows.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -145,6 +147,7 @@ True True + @@ -153,6 +156,9 @@ True True + + + ..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll @@ -161,6 +167,7 @@ ..\packages\System.Diagnostics.EventLog.8.0.0\lib\net462\System.Diagnostics.EventLog.dll + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll True @@ -169,6 +176,8 @@ ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -225,11 +234,18 @@ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - ..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll + ..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll + True + + + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll + True + True ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -239,6 +255,7 @@ True True + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -300,9 +317,6 @@ PreserveNewest - - - + + + + diff --git a/Samples/WinSortFilter/WinSortFilter/WinSortFilter.csproj b/Samples/WinSortFilter/WinSortFilter/WinSortFilter.csproj index 904ff58772..3379bd3b00 100644 --- a/Samples/WinSortFilter/WinSortFilter/WinSortFilter.csproj +++ b/Samples/WinSortFilter/WinSortFilter/WinSortFilter.csproj @@ -58,99 +58,102 @@ false - - ..\packages\Csla.8.0.0-R24021202\lib\net48\Csla.dll + + ..\packages\Backport.System.Threading.Lock.3.1.4\lib\net45\Backport.System.Threading.Lock.dll - - ..\packages\Csla.Windows.Forms.8.0.0-R24021202\lib\net462\Csla.Windows.dll + + ..\packages\Csla.9.0.0-rc4-gc005a93a3c\lib\net48\Csla.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Csla.Windows.Forms.9.0.0-rc4-gc005a93a3c\lib\net462\Csla.Windows.dll - - ..\packages\Microsoft.Extensions.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Configuration.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\packages\Microsoft.Extensions.Configuration.9.0.1\lib\net462\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.8.0.1\lib\net462\Microsoft.Extensions.Configuration.Binder.dll + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.CommandLine.8.0.0\lib\net462\Microsoft.Extensions.Configuration.CommandLine.dll + + ..\packages\Microsoft.Extensions.Configuration.Binder.9.0.1\lib\net462\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.8.0.0\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll + + ..\packages\Microsoft.Extensions.Configuration.CommandLine.9.0.1\lib\net462\Microsoft.Extensions.Configuration.CommandLine.dll - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.8.0.0\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll + + ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.9.0.1\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll - - ..\packages\Microsoft.Extensions.Configuration.Json.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Json.dll + + ..\packages\Microsoft.Extensions.Configuration.FileExtensions.9.0.1\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll - - ..\packages\Microsoft.Extensions.Configuration.UserSecrets.8.0.0\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll + + ..\packages\Microsoft.Extensions.Configuration.Json.9.0.1\lib\net462\Microsoft.Extensions.Configuration.Json.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + ..\packages\Microsoft.Extensions.Configuration.UserSecrets.9.0.1\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.Diagnostics.8.0.0\lib\net462\Microsoft.Extensions.Diagnostics.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.Diagnostics.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Diagnostics.Abstractions.dll + + ..\packages\Microsoft.Extensions.Diagnostics.9.0.1\lib\net462\Microsoft.Extensions.Diagnostics.dll - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\packages\Microsoft.Extensions.Diagnostics.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Diagnostics.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Physical.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll + + ..\packages\Microsoft.Extensions.FileProviders.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.8.0.0\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll + + ..\packages\Microsoft.Extensions.FileProviders.Physical.9.0.1\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll - - ..\packages\Microsoft.Extensions.Hosting.8.0.0\lib\net462\Microsoft.Extensions.Hosting.dll + + ..\packages\Microsoft.Extensions.FileSystemGlobbing.9.0.1\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\packages\Microsoft.Extensions.Hosting.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll + + ..\packages\Microsoft.Extensions.Hosting.9.0.1\lib\net462\Microsoft.Extensions.Hosting.dll - - ..\packages\Microsoft.Extensions.Logging.8.0.0\lib\net462\Microsoft.Extensions.Logging.dll + + ..\packages\Microsoft.Extensions.Hosting.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Extensions.Logging.9.0.1\lib\net462\Microsoft.Extensions.Logging.dll - - ..\packages\Microsoft.Extensions.Logging.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll + + ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Console.8.0.0\lib\net462\Microsoft.Extensions.Logging.Console.dll + + ..\packages\Microsoft.Extensions.Logging.Configuration.9.0.1\lib\net462\Microsoft.Extensions.Logging.Configuration.dll - - ..\packages\Microsoft.Extensions.Logging.Debug.8.0.0\lib\net462\Microsoft.Extensions.Logging.Debug.dll + + ..\packages\Microsoft.Extensions.Logging.Console.9.0.1\lib\net462\Microsoft.Extensions.Logging.Console.dll - - ..\packages\Microsoft.Extensions.Logging.EventLog.8.0.0\lib\net462\Microsoft.Extensions.Logging.EventLog.dll + + ..\packages\Microsoft.Extensions.Logging.Debug.9.0.1\lib\net462\Microsoft.Extensions.Logging.Debug.dll - - ..\packages\Microsoft.Extensions.Logging.EventSource.8.0.0\lib\net462\Microsoft.Extensions.Logging.EventSource.dll + + ..\packages\Microsoft.Extensions.Logging.EventLog.9.0.1\lib\net462\Microsoft.Extensions.Logging.EventLog.dll - - ..\packages\Microsoft.Extensions.Options.8.0.1\lib\net462\Microsoft.Extensions.Options.dll + + ..\packages\Microsoft.Extensions.Logging.EventSource.9.0.1\lib\net462\Microsoft.Extensions.Logging.EventSource.dll - - ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.8.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll + + ..\packages\Microsoft.Extensions.Options.9.0.1\lib\net462\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.9.0.1\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll + + + ..\packages\Microsoft.Extensions.Primitives.9.0.1\lib\net462\Microsoft.Extensions.Primitives.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll @@ -162,6 +165,7 @@ True True + 3.5 @@ -170,23 +174,32 @@ True True - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll - - ..\packages\System.Diagnostics.EventLog.8.0.0\lib\net462\System.Diagnostics.EventLog.dll + + ..\packages\System.Diagnostics.EventLog.9.0.1\lib\net462\System.Diagnostics.EventLog.dll + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll True True - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.IO.Pipelines.9.0.1\lib\net462\System.IO.Pipelines.dll + + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll @@ -198,8 +211,8 @@ True True - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -210,7 +223,6 @@ ..\packages\System.Runtime.Serialization.Formatters.4.3.0\lib\net46\System.Runtime.Serialization.Formatters.dll True - True ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll @@ -240,20 +252,28 @@ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Encodings.Web.9.0.1\lib\net462\System.Text.Encodings.Web.dll - ..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll + ..\packages\System.Text.Json.9.0.1\lib\net462\System.Text.Json.dll + True + + + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll + True + True - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.ThreadPool.4.3.0\lib\net46\System.Threading.ThreadPool.dll True True + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -325,7 +345,7 @@ - +