diff --git a/web/Areas/CMS/Data/CMS.cs b/web/Areas/CMS/Data/CMS.cs index 6e0aeedc0..cc0b12e3b 100644 --- a/web/Areas/CMS/Data/CMS.cs +++ b/web/Areas/CMS/Data/CMS.cs @@ -628,7 +628,7 @@ public byte[] DecryptFile(byte[] encryptedData, string keystring) { byte[] secretkey = GetSecretKey(keystring); - Aes aes = Aes.Create(); + using Aes aes = Aes.Create(); aes.Mode = CipherMode.ECB; using var ms = new MemoryStream(); @@ -653,13 +653,13 @@ public byte[] DecryptFile(byte[] encryptedData, string keystring) public string DecryptAES(string encryptedString, string Key) { //First write to memory - MemoryStream mmsStream = new(); - StreamWriter srwTemp = new(mmsStream); + using MemoryStream mmsStream = new(); + using StreamWriter srwTemp = new(mmsStream); srwTemp.Write(encryptedString); srwTemp.Flush(); mmsStream.Position = 0; - MemoryStream outstream = new(); + using MemoryStream outstream = new(); //CallingUUDecode Codecs.UUDecode(mmsStream, outstream); diff --git a/web/Areas/Computing/Services/BiorenderStudentLookup.cs b/web/Areas/Computing/Services/BiorenderStudentLookup.cs index 5d6d3e93a..5aaaa8800 100644 --- a/web/Areas/Computing/Services/BiorenderStudentLookup.cs +++ b/web/Areas/Computing/Services/BiorenderStudentLookup.cs @@ -19,7 +19,7 @@ public BiorenderStudentLookup(IamApi iamapi) public async Task> GetBiorenderStudentInfo(List emails) { List> resultList = new(); - var throttler = new SemaphoreSlim(initialCount: 20); + using var throttler = new SemaphoreSlim(initialCount: 20); foreach (var email in emails) { await throttler.WaitAsync(); diff --git a/web/Areas/Effort/Services/DeptSummaryService.cs b/web/Areas/Effort/Services/DeptSummaryService.cs index f30b4dceb..c7e1e2b93 100644 --- a/web/Areas/Effort/Services/DeptSummaryService.cs +++ b/web/Areas/Effort/Services/DeptSummaryService.cs @@ -310,7 +310,7 @@ public Task GenerateReportPdfAsync(DeptSummaryReport report) public MemoryStream GenerateReportExcel(DeptSummaryReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Department Summary Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -428,7 +428,6 @@ public MemoryStream GenerateReportExcel(DeptSummaryReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/EvaluationReportService.cs b/web/Areas/Effort/Services/EvaluationReportService.cs index becc519e2..8992dba37 100644 --- a/web/Areas/Effort/Services/EvaluationReportService.cs +++ b/web/Areas/Effort/Services/EvaluationReportService.cs @@ -681,7 +681,7 @@ public Task GenerateDetailPdfAsync(EvalDetailReport report) public MemoryStream GenerateEvalSummaryExcel(EvalSummaryReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Eval Summary Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -735,14 +735,13 @@ public MemoryStream GenerateEvalSummaryExcel(EvalSummaryReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } public MemoryStream GenerateEvalDetailExcel(EvalDetailReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Eval Detail Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -819,7 +818,6 @@ public MemoryStream GenerateEvalDetailExcel(EvalDetailReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/MeritMultiYearService.cs b/web/Areas/Effort/Services/MeritMultiYearService.cs index d436c28d5..082a5fbdd 100644 --- a/web/Areas/Effort/Services/MeritMultiYearService.cs +++ b/web/Areas/Effort/Services/MeritMultiYearService.cs @@ -1261,7 +1261,7 @@ public Task GenerateReportPdfAsync(MultiYearReport report) public MemoryStream GenerateReportExcel(MultiYearReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Merit & Promotion Report - Multi-Year"; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, subject: $"Multi-year merit and evaluation summary for {report.Instructor}"); @@ -1494,7 +1494,6 @@ public MemoryStream GenerateReportExcel(MultiYearReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/MeritReportService.cs b/web/Areas/Effort/Services/MeritReportService.cs index b3a163fdb..3742430c9 100644 --- a/web/Areas/Effort/Services/MeritReportService.cs +++ b/web/Areas/Effort/Services/MeritReportService.cs @@ -918,7 +918,7 @@ public Task GenerateMeritAveragePdfAsync(MeritAverageReport report) public MemoryStream GenerateMeritDetailExcel(MeritDetailReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Merit & Promotion Detail Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -1017,14 +1017,13 @@ public MemoryStream GenerateMeritDetailExcel(MeritDetailReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } public MemoryStream GenerateMeritAverageExcel(MeritAverageReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Merit & Promotion Average Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -1163,7 +1162,6 @@ public MemoryStream GenerateMeritAverageExcel(MeritAverageReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/MeritSummaryService.cs b/web/Areas/Effort/Services/MeritSummaryService.cs index e8f3e7045..5817b7e35 100644 --- a/web/Areas/Effort/Services/MeritSummaryService.cs +++ b/web/Areas/Effort/Services/MeritSummaryService.cs @@ -368,7 +368,7 @@ public Task GenerateReportPdfAsync(MeritSummaryReport report) public MemoryStream GenerateReportExcel(MeritSummaryReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Merit & Promotion Summary Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -456,7 +456,6 @@ public MemoryStream GenerateReportExcel(MeritSummaryReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/SchoolSummaryService.cs b/web/Areas/Effort/Services/SchoolSummaryService.cs index fc605fe3f..f22771ca8 100644 --- a/web/Areas/Effort/Services/SchoolSummaryService.cs +++ b/web/Areas/Effort/Services/SchoolSummaryService.cs @@ -339,7 +339,7 @@ public Task GenerateReportPdfAsync(SchoolSummaryReport report) public MemoryStream GenerateReportExcel(SchoolSummaryReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "School Summary Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -480,7 +480,6 @@ public MemoryStream GenerateReportExcel(SchoolSummaryReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Areas/Effort/Services/TeachingActivityService.cs b/web/Areas/Effort/Services/TeachingActivityService.cs index 538122279..043533010 100644 --- a/web/Areas/Effort/Services/TeachingActivityService.cs +++ b/web/Areas/Effort/Services/TeachingActivityService.cs @@ -485,7 +485,7 @@ public Task GenerateIndividualReportPdfAsync(TeachingActivityReport repo public MemoryStream GenerateReportExcel(TeachingActivityReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Teaching Activity Report"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -596,14 +596,13 @@ public MemoryStream GenerateReportExcel(TeachingActivityReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } public MemoryStream GenerateIndividualReportExcel(TeachingActivityReport report) { - var wb = new XLWorkbook(); + using var wb = new XLWorkbook(); const string reportTitle = "Teaching Activity Report (Individual)"; var termName = report.AcademicYear ?? report.TermName; ExcelAccessibilityHelper.SetCoreProperties(wb, reportTitle, @@ -694,7 +693,6 @@ public MemoryStream GenerateIndividualReportExcel(TeachingActivityReport report) var stream = new MemoryStream(); wb.SaveAs(stream); - wb.Dispose(); stream.Position = 0; return stream; } diff --git a/web/Classes/Utilities/F5HttpRequest.cs b/web/Classes/Utilities/F5HttpRequest.cs index 147a30e8f..ea87b0d4c 100644 --- a/web/Classes/Utilities/F5HttpRequest.cs +++ b/web/Classes/Utilities/F5HttpRequest.cs @@ -41,11 +41,9 @@ public async Task Send(HttpRequestMessage request, int atte if (request.Method != HttpMethod.Get && attemptNumber == 0) { //Try a send to the original url, with a get and empty body. - HttpRequestMessage newRequest = new() - { - RequestUri = request.RequestUri, - Method = HttpMethod.Get - }; + using HttpRequestMessage newRequest = new(); + newRequest.RequestUri = request.RequestUri; + newRequest.Method = HttpMethod.Get; //don't care about the response await Send(newRequest);