6.0.0 update (#19)

* Update framework to .net6

* Updates

Author: DiegoGalante

src/Adapters/WorkItemAdapter.cs

@@ -51,7 +51,7 @@ public List<WorkItemDto> ToWorkItemsDto(List<WorkItem> workItems)
                      .ToList();
         }
 
-        public WorkItemChangeDto ToWorkItemChangeDto(WorkItemChange workIteChange)
+        public static WorkItemChangeDto ToWorkItemChangeDto(WorkItemChange workIteChange)
         {
             if (workIteChange is null) return null;
 
@@ -65,7 +65,7 @@ public WorkItemChangeDto ToWorkItemChangeDto(WorkItemChange workIteChange)
             };
         }
 
-        public List<WorkItemChangeDto> ToWorkItemsChangeDto(List<WorkItemChange> workItemsChanges)
+        public static List<WorkItemChangeDto> ToWorkItemsChangeDto(List<WorkItemChange> workItemsChanges)
         {
             var workItemsChangeDto = new List<WorkItemChangeDto>();
 
@@ -80,7 +80,7 @@ public List<WorkItemChangeDto> ToWorkItemsChangeDto(List<WorkItemChange> workIte
                      .ToList();
         }
 
-        public TimeByStateDto ToTimeByStateDto(TimeByState workItemStatusTime)
+        public static TimeByStateDto ToTimeByStateDto(TimeByState workItemStatusTime)
         {
             if (workItemStatusTime is null) return null;
 
@@ -93,7 +93,7 @@ public TimeByStateDto ToTimeByStateDto(TimeByState workItemStatusTime)
             };
         }
 
-        public List<TimeByStateDto> ToTimeByStatesDto(List<TimeByState> workItemStatusTimes)
+        public static List<TimeByStateDto> ToTimeByStatesDto(List<TimeByState> workItemStatusTimes)
         {
             var workItemStatusTimeDto = new List<TimeByStateDto>();
 

src/AzureDevopsTracker.csproj

@@ -26,16 +26,17 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.28" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="..\LICENSE.md.txt">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 

src/Configurations/Configuration.cs

@@ -15,7 +15,9 @@ namespace AzureDevopsTracker.Configurations
 {
     public static class Configuration
     {
-        public static IServiceCollection AddAzureDevopsTracker(this IServiceCollection services, DataBaseConfig configurations, MessageConfig messageConfig = null)
+        public static IServiceCollection AddAzureDevopsTracker(this IServiceCollection services,
+                                                               DataBaseConfig configurations,
+                                                               MessageConfig messageConfig = null)
         {
             services.AddDbContext<AzureDevopsTrackerContext>(options =>
                     options.UseSqlServer(DataBaseConfig.ConnectionsString));

src/Data/ChangeLogItemRepository.cs

@@ -1,23 +1,25 @@
 using AzureDevopsTracker.Data.Context;
 using AzureDevopsTracker.Entities;
 using AzureDevopsTracker.Interfaces.Internals;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace AzureDevopsTracker.Data
 {
     internal class ChangeLogItemRepository : Repository<ChangeLogItem>, IChangeLogItemRepository
     {
         public ChangeLogItemRepository(AzureDevopsTrackerContext context) : base(context) { }
 
-        public int CountItemsForRelease()
+        public async Task<int> CountItemsForRelease()
         {
-            return DbSet.Count(x => string.IsNullOrEmpty(x.ChangeLogId));
+            return await DbSet.CountAsync(x => string.IsNullOrEmpty(x.ChangeLogId));
         }
 
-        public IEnumerable<ChangeLogItem> ListWaitingForRelease()
+        public async Task<IEnumerable<ChangeLogItem>> ListWaitingForRelease()
         {
-            return DbSet.Where(x => string.IsNullOrEmpty(x.ChangeLogId));
+            return await DbSet.Where(x => string.IsNullOrEmpty(x.ChangeLogId)).ToListAsync();
         }
     }
 }

src/Data/ChangeLogRepository.cs

@@ -1,18 +1,19 @@
 using AzureDevopsTracker.Data.Context;
 using AzureDevopsTracker.Entities;
 using AzureDevopsTracker.Interfaces.Internals;
+using Microsoft.EntityFrameworkCore;
 using System;
-using System.Linq;
+using System.Threading.Tasks;
 
 namespace AzureDevopsTracker.Data
 {
     internal class ChangeLogRepository : Repository<ChangeLog>, IChangeLogRepository
     {
         public ChangeLogRepository(AzureDevopsTrackerContext context) : base(context) { }
 
-        public int CountChangeLogsCreatedToday()
+        public async Task<int> CountChangeLogsCreatedToday()
         {
-            return DbSet.Count(x => x.CreatedAt.Date == DateTime.Now.Date);
+            return await DbSet.CountAsync(x => x.CreatedAt.Date == DateTime.Now.Date);
         }
     }
 }

src/Entities/ChangeLogItem.cs

@@ -10,7 +10,7 @@ public class ChangeLogItem : Entity
         public string Description { get; private set; }
         public string WorkItemType { get; private set; }
         public string ChangeLogId { get; private set; }
-        public bool WasReleased => string.IsNullOrEmpty(ChangeLogId?.Trim());
+        public bool WasReleased => string.IsNullOrWhiteSpace(ChangeLogId);
         public ChangeLog ChangeLog { get; private set; }
 
         private ChangeLogItem() { }

src/Entities/WorkItem.cs

@@ -142,7 +142,9 @@ public IEnumerable<TimeByState> CalculateTotalTimeByState()
             if (!_workItemsChanges.Any())
                 return timesByStateList;
 
-            foreach (var workItemChange in _workItemsChanges.OrderBy(x => x.CreatedAt).GroupBy(x => x.OldState).Where(x => x.Key is not null))
+            foreach (var workItemChange in _workItemsChanges.OrderBy(x => x.CreatedAt)
+                                                            .GroupBy(x => x.OldState)
+                                                            .Where(x => x.Key is not null))
             {
                 var totalTime = TimeSpan.Zero;
                 var totalWorkedTime = TimeSpan.Zero;

src/Entities/WorkItemChange.cs

@@ -139,7 +139,7 @@ public double CalculateTotalWorkedTime()
         }
 
         #region Private Methods
-        private TimeSpan SubtractDates(DateTime biger, DateTime minor)
+        private static TimeSpan SubtractDates(DateTime biger, DateTime minor)
         {
             if (biger.Hour == minor.Hour)
             {

src/Integrations/DiscordIntegration.cs

@@ -97,7 +97,7 @@ public class Field
             public bool IsInline { get; set; }
         }
 
-        private IEnumerable<Field> GetText(ChangeLog changeLog)
+        private static IEnumerable<Field> GetText(ChangeLog changeLog)
         {
             var changeLogItemsAgrupado = changeLog.ChangeLogItems.GroupBy(d => d.WorkItemType);
 

src/Integrations/MessageIntegration.cs

@@ -13,48 +13,46 @@ public abstract class MessageIntegration
         private static readonly string MEGAFONE_GIF = "megafone.gif";
         private static readonly string LOGO_TYPINGHARD_16X16 = "logo-typinghard-16x16.png";
 
-        protected internal string GetTitle()
+        protected internal static string GetTitle()
         {
             return $"Nova atualização da plataforma";
         }
 
-        protected internal string GetVersion(ChangeLog changeLog)
+        protected internal static string GetVersion(ChangeLog changeLog)
         {
             return $"Versão: {changeLog.Number}";
         }
 
-        protected internal string GetAnnouncementImageUrl()
+        protected internal static string GetAnnouncementImageUrl()
         {
             return $"{CDN_URL}{MEGAFONE_GIF}";
         }
 
-        protected internal string GetLogoTypingHard16x16Url()
+        protected internal static string GetLogoTypingHard16x16Url()
         {
             return $"{CDN_URL}{LOGO_TYPINGHARD_16X16}";
         }
 
-        protected internal string GetFileVersion()
+        protected internal static string GetFileVersion()
         {
             System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
             System.Diagnostics.FileVersionInfo fileVersionInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
             return fileVersionInfo.FileVersion;
         }
 
-        protected internal string GetNugetVersion()
+        protected internal static string GetNugetVersion()
         {
             return $"Powered by **Typing Hard** • nuget version {GetFileVersion()}";
         }
 
-        protected internal HttpResponseMessage Notify(object body)
+        protected internal static HttpResponseMessage Notify(object body)
         {
             var json = Newtonsoft.Json.JsonConvert.SerializeObject(body);
             var content = new StringContent(json,
                                             Encoding.UTF8,
                                             MIMETYPE);
-            HttpClient client = new HttpClient();
-            return client.PostAsync(new Uri(MessageConfig.URL),
-                content).Result;
-
+            using HttpClient client = new();
+            return client.PostAsync(new Uri(MessageConfig.URL), content).Result;
         }
     }
 }