From 9924153e8265fa9dc819958a48f66ba6444c4234 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 6 Nov 2023 11:24:58 +1100 Subject: [PATCH] upgrade dotnet framework 4.5 to 4.6 --- Disco.BI/Disco.BI.csproj | 2 +- Disco.BI/Properties/Resources.Designer.cs | 2 +- Disco.BI/app.config | 46 +++---- Disco.Data/App.config | 4 +- Disco.Data/Disco.Data.csproj | 2 +- Disco.Data/Properties/Resources.Designer.cs | 4 +- Disco.Models/App.config | 4 +- Disco.Models/Disco.Models.csproj | 2 +- .../App.config | 34 +++--- ....Services.Plugins.ManifestGenerator.csproj | 3 +- Disco.Services/App.config | 2 +- Disco.Services/Authorization/Claims.cs | 4 +- Disco.Services/Disco.Services.csproj | 2 +- .../Properties/Resources.Designer.cs | 2 +- Disco.Web.Extensions/App.config | 42 +++---- .../Disco.Web.Extensions.csproj | 2 +- Disco.Web/App_Code/AjaxHelpers.generated.cs | 114 ++++++++++-------- .../AuthorizationRole/Create.generated.cs | 3 +- .../Views/AuthorizationRole/Show.generated.cs | 3 +- .../Views/DeviceBatch/Create.generated.cs | 3 +- .../Views/DeviceBatch/Timeline.generated.cs | 3 +- .../GenericComponents.generated.cs | 3 +- .../_DeviceComponentsTable.generated.cs | 7 +- .../Views/DeviceProfile/Create.generated.cs | 3 +- .../Views/DeviceProfile/Defaults.generated.cs | 3 +- .../Views/DeviceProfile/Index.generated.cs | 3 +- .../Views/DeviceProfile/_Table.generated.cs | 7 +- .../UndetectedPages.generated.cs | 3 +- .../_ExpressionsTable.generated.cs | 1 - .../Views/Expressions/Editor.generated.cs | 3 +- .../JobPreferences/Parts/General.generated.cs | 3 +- .../Parts/Locations.generated.cs | 3 +- .../JobPreferences/Parts/Reports.generated.cs | 3 +- .../Config/Views/JobQueue/Create.generated.cs | 3 +- .../Config/Views/JobQueue/Index.generated.cs | 3 +- .../Config/Views/Logging/Index.generated.cs | 3 +- .../Views/Logging/TaskStatus.generated.cs | 3 +- .../Views/Organisation/Index.generated.cs | 3 +- .../Config/Views/Plugins/Index.generated.cs | 3 +- .../ProviderConfiguration.generated.cs | 3 +- .../Views/Shared/LogEvents.generated.cs | 3 +- .../Views/Shared/TaskStatus.generated.cs | 3 +- .../Config/Views/UserFlag/Create.generated.cs | 3 +- .../Config/Views/_ViewStart.generated.cs | 7 +- .../Views/HeldDevices/Index.generated.cs | 3 +- .../HeldDevices/Noticeboard.generated.cs | 3 +- .../Public/Views/Public/Index.generated.cs | 3 +- .../Public/Views/Public/Licence.generated.cs | 3 +- .../Views/UserHeldDevices/Index.generated.cs | 3 +- .../UserHeldDevices/Noticeboard.generated.cs | 3 +- .../Public/Views/_ViewStart.generated.cs | 7 +- Disco.Web/Disco.Web.csproj | 10 +- Disco.Web/Extensions/T4MVC/T4MVC.cs | 5 - .../_AssignmentHistory.generated.cs | 7 +- .../DeviceParts/_Certificates.generated.cs | 7 +- .../Views/Device/DeviceParts/_Details.cshtml | 6 +- .../Device/DeviceParts/_Details.generated.cs | 105 ++++++++-------- .../Device/DeviceParts/_Jobs.generated.cs | 7 +- Disco.Web/Views/Device/Index.generated.cs | 3 +- Disco.Web/Views/Device/Show.generated.cs | 3 +- .../Views/Device/_ViewStart.generated.cs | 7 +- .../InitialConfig/_ViewStart.generated.cs | 7 +- Disco.Web/Views/Job/Create.generated.cs | 3 +- .../Views/Job/Create_Redirect.generated.cs | 3 +- Disco.Web/Views/Job/Index.generated.cs | 3 +- .../Job/JobParts/Components.generated.cs | 3 +- .../Views/Job/JobParts/Flags.generated.cs | 3 +- .../Views/Job/JobParts/Insurance.generated.cs | 3 +- .../JobParts/JobMetaAdditions1.generated.cs | 3 +- .../Job/JobParts/NonWarranty.generated.cs | 3 +- .../JobParts/NonWarrantyFinance.generated.cs | 3 +- .../Views/Job/JobParts/Queues.generated.cs | 3 +- .../Views/Job/JobParts/Repairs.generated.cs | 3 +- .../Views/Job/JobParts/Warranty.generated.cs | 3 +- Disco.Web/Views/Job/List.generated.cs | 3 +- Disco.Web/Views/Job/LogRepair.generated.cs | 3 +- .../Views/Job/LogRepairDisclose.generated.cs | 3 +- .../Views/Job/LogRepairError.generated.cs | 3 +- Disco.Web/Views/Job/LogWarranty.generated.cs | 3 +- .../Job/LogWarrantyDisclose.generated.cs | 3 +- .../Views/Job/LogWarrantyError.generated.cs | 3 +- .../Job/RepairProviderJobDetails.generated.cs | 3 +- Disco.Web/Views/Job/Show.generated.cs | 3 +- .../WarrantyProviderJobDetails.generated.cs | 3 +- .../Views/Job/_CreateSubject.generated.cs | 7 +- Disco.Web/Views/Job/_ViewStart.generated.cs | 7 +- Disco.Web/Views/Search/Query.generated.cs | 3 +- .../AccessDeniedException.generated.cs | 7 +- .../DisplayTemplates/Exception.generated.cs | 7 +- Disco.Web/Views/Shared/Error.generated.cs | 3 +- .../Views/Shared/_DialogLayout.generated.cs | 7 +- .../Views/Shared/_EmptyLayout.generated.cs | 7 +- Disco.Web/Views/Shared/_JobTable.generated.cs | 7 +- .../Views/Shared/_JobTableRender.generated.cs | 7 +- .../Views/Shared/_SearchDialog.generated.cs | 7 +- .../Views/Update/_ViewStart.generated.cs | 26 +++- Disco.Web/Views/User/Index.generated.cs | 3 +- .../UserParts/_AssignmentHistory.generated.cs | 7 +- .../UserParts/_Authorization.generated.cs | 7 +- .../Views/User/UserParts/_Jobs.generated.cs | 7 +- Disco.Web/Views/User/_UserTable.generated.cs | 7 +- Disco.Web/Views/User/_ViewStart.generated.cs | 7 +- Disco.Web/Views/_ViewStart.generated.cs | 7 +- Disco.Web/Web.config | 7 +- 104 files changed, 363 insertions(+), 404 deletions(-) diff --git a/Disco.BI/Disco.BI.csproj b/Disco.BI/Disco.BI.csproj index 8beaac0a..e67cc353 100644 --- a/Disco.BI/Disco.BI.csproj +++ b/Disco.BI/Disco.BI.csproj @@ -10,7 +10,7 @@ Properties Disco Disco.BI - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.BI/Properties/Resources.Designer.cs b/Disco.BI/Properties/Resources.Designer.cs index 70d245f4..f789e168 100644 --- a/Disco.BI/Properties/Resources.Designer.cs +++ b/Disco.BI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Disco.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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.BI/app.config b/Disco.BI/app.config index f12e1e2f..4ebd93b2 100644 --- a/Disco.BI/app.config +++ b/Disco.BI/app.config @@ -1,57 +1,57 @@ - + -
+
- - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Data/App.config b/Disco.Data/App.config index 24c7f4a8..f2516e03 100644 --- a/Disco.Data/App.config +++ b/Disco.Data/App.config @@ -15,6 +15,6 @@ - + - \ No newline at end of file + diff --git a/Disco.Data/Disco.Data.csproj b/Disco.Data/Disco.Data.csproj index 08459754..f41fd7c7 100644 --- a/Disco.Data/Disco.Data.csproj +++ b/Disco.Data/Disco.Data.csproj @@ -10,7 +10,7 @@ Properties Disco.Data Disco.Data - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Data/Properties/Resources.Designer.cs b/Disco.Data/Properties/Resources.Designer.cs index de46338e..fa987387 100644 --- a/Disco.Data/Properties/Resources.Designer.cs +++ b/Disco.Data/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// 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 Disco.Data.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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.Models/App.config b/Disco.Models/App.config index c68f3757..ea64970f 100644 --- a/Disco.Models/App.config +++ b/Disco.Models/App.config @@ -12,6 +12,6 @@ - + - \ No newline at end of file + diff --git a/Disco.Models/Disco.Models.csproj b/Disco.Models/Disco.Models.csproj index 6b904b7a..52c5ee8e 100644 --- a/Disco.Models/Disco.Models.csproj +++ b/Disco.Models/Disco.Models.csproj @@ -10,7 +10,7 @@ Properties Disco.Models Disco.Models - v4.5.2 + v4.6.2 512 diff --git a/Disco.Services.Plugins.ManifestGenerator/App.config b/Disco.Services.Plugins.ManifestGenerator/App.config index 1327618b..b4565340 100644 --- a/Disco.Services.Plugins.ManifestGenerator/App.config +++ b/Disco.Services.Plugins.ManifestGenerator/App.config @@ -1,38 +1,38 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj b/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj index f7e8241e..1a9b69c3 100644 --- a/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj +++ b/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj @@ -9,9 +9,10 @@ Properties Disco.Services.Plugins.ManifestGenerator Disco.Services.Plugins.ManifestGenerator - v4.5.2 + v4.6.2 512 true + AnyCPU diff --git a/Disco.Services/App.config b/Disco.Services/App.config index 2e657e04..f787e7ee 100644 --- a/Disco.Services/App.config +++ b/Disco.Services/App.config @@ -12,7 +12,7 @@ - + diff --git a/Disco.Services/Authorization/Claims.cs b/Disco.Services/Authorization/Claims.cs index 33a3becd..b0b59012 100644 --- a/Disco.Services/Authorization/Claims.cs +++ b/Disco.Services/Authorization/Claims.cs @@ -220,7 +220,7 @@ namespace Disco.Services.Authorization { "User.ShowFlagAssignments", new Tuple, Action, string, string, bool>(c => c.User.ShowFlagAssignments, (c, v) => c.User.ShowFlagAssignments = v, "Show Users Flag Assignments", "Can show flags associated with users", false) }, { "User.ShowJobs", new Tuple, Action, string, string, bool>(c => c.User.ShowJobs, (c, v) => c.User.ShowJobs = v, "Show Users Jobs", "Can show jobs associated with users", false) }, { "ComputerAccount", new Tuple, Action, string, string, bool>(c => c.ComputerAccount, (c, v) => c.ComputerAccount = v, "Computer Account", "Represents a computer account", true) }, - { "DiscoAdminAccount", new Tuple, Action, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco ICT Administrator Account", "Represents a Disco ICT Administrator account", true) } + { "DiscoAdminAccount", new Tuple, Action, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco Administrator Account", "Represents a Disco ICT Administrator account", true) } }; #endregion @@ -1917,7 +1917,7 @@ namespace Disco.Services.Authorization /// public const string ComputerAccount = "ComputerAccount"; - /// Disco ICT Administrator Account + /// Disco Administrator Account /// Represents a Disco ICT Administrator account /// public const string DiscoAdminAccount = "DiscoAdminAccount"; diff --git a/Disco.Services/Disco.Services.csproj b/Disco.Services/Disco.Services.csproj index 8971a704..7aef474c 100644 --- a/Disco.Services/Disco.Services.csproj +++ b/Disco.Services/Disco.Services.csproj @@ -11,7 +11,7 @@ Properties Disco.Services Disco.Services - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Services/Properties/Resources.Designer.cs b/Disco.Services/Properties/Resources.Designer.cs index 242bac51..279f0604 100644 --- a/Disco.Services/Properties/Resources.Designer.cs +++ b/Disco.Services/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Disco.Services.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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.Web.Extensions/App.config b/Disco.Web.Extensions/App.config index 0a57a3d2..9f709e05 100644 --- a/Disco.Web.Extensions/App.config +++ b/Disco.Web.Extensions/App.config @@ -1,53 +1,53 @@ - + -
+
- + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Web.Extensions/Disco.Web.Extensions.csproj b/Disco.Web.Extensions/Disco.Web.Extensions.csproj index e9fcb067..95559bbf 100644 --- a/Disco.Web.Extensions/Disco.Web.Extensions.csproj +++ b/Disco.Web.Extensions/Disco.Web.Extensions.csproj @@ -10,7 +10,7 @@ Properties Disco.Web.Extensions Disco.Web.Extensions - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Web/App_Code/AjaxHelpers.generated.cs b/Disco.Web/App_Code/AjaxHelpers.generated.cs index ebd4986f..89fd049c 100644 --- a/Disco.Web/App_Code/AjaxHelpers.generated.cs +++ b/Disco.Web/App_Code/AjaxHelpers.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -46,161 +46,177 @@ namespace Disco.Web public class AjaxHelpers : System.Web.WebPages.HelperPage { +#line 5 "..\..\App_Code\AjaxHelpers.cshtml" public static System.Web.WebPages.HelperResult AjaxLoader(string id = null) { +#line default +#line hidden return new System.Web.WebPages.HelperResult(__razor_helper_writer => { - - #line 6 "..\..\App_Code\AjaxHelpers.cshtml" Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); + #line default #line hidden - -WriteLiteralTo(@__razor_helper_writer, " "); -WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxLoading\" title=\"Loading...\">"); - - - -WriteLiteralTo(@__razor_helper_writer, "\r\n"); - +WriteLiteralTo(__razor_helper_writer, " class=\"fa fa-check fa-lg hidden ajaxOk\" title=\"Ok\">\r\n"); #line 9 "..\..\App_Code\AjaxHelpers.cshtml" + +#line default +#line hidden +}); + +#line 9 "..\..\App_Code\AjaxHelpers.cshtml" +} #line default #line hidden -}); - -} - - +#line 10 "..\..\App_Code\AjaxHelpers.cshtml" public static System.Web.WebPages.HelperResult AjaxSave() { +#line default +#line hidden return new System.Web.WebPages.HelperResult(__razor_helper_writer => { - - #line 11 "..\..\App_Code\AjaxHelpers.cshtml" + #line default #line hidden +WriteLiteralTo(__razor_helper_writer, "