From bb24d1207dab92079df2281b989c74c60566cd09 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 6 Feb 2025 15:57:41 -0500 Subject: [PATCH] Using Net 4.8.1 build of CSLA --- .../VEPROMS User Interface/VEPROMS_UI.csproj | 5 +++-- .../VEPROMS.CSLA.Library.csproj | 5 +++-- .../Volian.Controls.Library.csproj | 5 +++-- .../Volian.Print.Library.csproj | 5 +++-- .../csla20cs/csla20cs/Csla/Csla.csproj | 13 +++++------ .../Csla/Properties/Resources.Designer.cs | 4 ++-- .../Csla/Properties/Settings.Designer.cs | 4 ++-- .../WebServiceHost/Reference.cs | 22 +++++++++---------- .../csla20cs/csla20cs/Csla/app.config | 8 +++---- .../csla20cs/csla20cs/cslacs.sln | 9 ++++++-- 10 files changed, 44 insertions(+), 36 deletions(-) diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 4fefad85..3b1ec013 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -103,8 +103,9 @@ - - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + + False + ..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 27ab4591..27d8dee3 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -83,8 +83,9 @@ false - - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + + False + ..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll False diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index 8a80731b..2098c7bd 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -89,8 +89,9 @@ - - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + + False + ..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll False diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 0eefd34f..d272fbe1 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -66,8 +66,9 @@ - - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + + False + ..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll ..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj index 27247cbd..14ceb0b1 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj @@ -12,12 +12,13 @@ Csla true CslaKey.snk - v2.0 + v4.8.1 2.0 + true @@ -29,6 +30,7 @@ 4 false bin\Debug\Csla.XML + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false @@ -173,12 +176,8 @@ - - Component - - - Component - + + diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs index a943293f..dc077079 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Csla.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs index 1016da97..5eaf7fad 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace Csla.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs index 60795ad3..02fa2abb 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18408. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. // #pragma warning disable 1591 @@ -23,7 +23,7 @@ namespace Csla.WebServiceHost { /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="WebServicePortalSoap", Namespace="http://ws.lhotka.net/Csla")] @@ -227,11 +227,11 @@ namespace Csla.WebServiceHost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void CreateCompletedEventHandler(object sender, CreateCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class CreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -253,11 +253,11 @@ namespace Csla.WebServiceHost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void FetchCompletedEventHandler(object sender, FetchCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class FetchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -279,11 +279,11 @@ namespace Csla.WebServiceHost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void UpdateCompletedEventHandler(object sender, UpdateCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class UpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -305,11 +305,11 @@ namespace Csla.WebServiceHost { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void DeleteCompletedEventHandler(object sender, DeleteCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config index 7eb143a4..d4167840 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config @@ -1,8 +1,8 @@ - + - -
+ +
@@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln index 5a2886d1..efd2ead2 100644 --- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln +++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.35706.149 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla", "Csla\Csla.csproj", "{9DA591ED-C570-47AC-8E5D-35B039E07973}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F19F70D9-566D-4303-B0CD-69327F32FCFF}" @@ -23,6 +25,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3DB3F350-552A-4162-8E47-3117D986B11F} + EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = cslacs.vsmdi EndGlobalSection