Skip to content

Upgrade net6 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade net6 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
728ee4e
upgrade net6
Apr 13, 2022
2c56ec6
Remove obselete methods
Apr 13, 2022
fba3c3f
Merge branch 'master' into UpgradeNET6
mike-f50 Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions HelpMyStreet.Utils/HelpMyStreet.Cache/HelpMyStreet.Cache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>HelpMyStreet</Company>
<Product>HelpMyStreet</Product>
Expand All @@ -13,9 +13,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.9" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
<PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
Expand Down
6 changes: 3 additions & 3 deletions HelpMyStreet.Utils/HelpMyStreet.Contracts/HelpMyStreet.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>HelpMyStreet</Company>
<Product>HelpMyStreet</Product>
Expand All @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="8.1.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/Extensions/ModelBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,16 @@ private static void SetupPostcodeCoordinateTables<T>(EntityTypeBuilder<T> entity
private static void SetupPostcodeDefaultIndexes<T>(EntityTypeBuilder<T> entity) where T : PostcodeEntityBase
{
entity.HasIndex(u => u.Postcode)
.HasName("UX_Postcode_Postcode")
.HasDatabaseName("UX_Postcode_Postcode")
.IsUnique();

entity.HasIndex(u => new { u.Postcode, u.IsActive })
.HasName("IX_Postcode_Postcode_IsActive")
.ForSqlServerInclude(nameof(PostcodeEntityBase.Latitude), nameof(PostcodeEntityBase.Longitude));
.HasDatabaseName("IX_Postcode_Postcode_IsActive")
.IncludeProperties(nameof(PostcodeEntityBase.Latitude), nameof(PostcodeEntityBase.Longitude));

entity.HasIndex(u => new { u.Latitude, u.Longitude, u.IsActive })
.ForSqlServerInclude(nameof(PostcodeEntityBase.Postcode))
.HasName("IX_Postcode_Latitude_Longitude_IsActive");
.HasDatabaseName("IX_Postcode_Latitude_Longitude_IsActive")
.IncludeProperties(nameof(PostcodeEntityBase.Postcode));
}

}
Expand Down
13 changes: 8 additions & 5 deletions ...reet.Utils/HelpMyStreet.PostcodeCoordinates.EF/HelpMyStreet.PostcodeCoordinates.EF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Company>HelpMyStreet</Company>
<Product>HelpMyStreet</Product>
<Authors>HelpMyStreet</Authors>
Expand All @@ -10,9 +10,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
25 changes: 12 additions & 13 deletions HelpMyStreet.Utils/HelpMyStreet.UnitTests/HelpMyStreet.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<PackageId>HelpMyStreet.CoreV3.UnitTests</PackageId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
<PackageReference Include="Moq" Version="4.14.7" />
<PackageReference Include="NewRelic.Agent.Api" Version="8.33.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="NewRelic.Agent.Api" Version="9.7.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
<PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="Polly.Caching.MemoryCache" Version="1.1.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions HelpMyStreet.Utils/HelpMyStreet.Utils.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29905.134
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelpMyStreet.Utils", "HelpMyStreet.Utils\HelpMyStreet.Utils.csproj", "{16EB0369-C3E5-45D7-AAF6-1F19951627E2}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion HelpMyStreet.Utils/HelpMyStreet.Utils/CoordinatedResetCache/CoordinatedResetCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public CoordinatedResetCache(IPollyMemoryCacheProvider pollyMemoryCacheProvider,
[Obsolete("Use MemDistCache in HelpMyStreet.Cache package")]
public async Task<T> GetCachedDataAsync<T>(Func<CancellationToken, Task<T>> dataGetter, string key, CancellationToken cancellationToken, CoordinatedResetCacheTime resetCacheTime = CoordinatedResetCacheTime.OnHour)
{
TimeSpan timeToReset;
TimeSpan timeToReset = GetLengthOfTimeUntilNextHour();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an intended change?


switch (resetCacheTime)
{
Expand Down
16 changes: 8 additions & 8 deletions HelpMyStreet.Utils/HelpMyStreet.Utils/HelpMyStreet.Utils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>HelpMyStreet</Company>
<Product>HelpMyStreet</Product>
Expand All @@ -13,15 +13,15 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
<PackageReference Include="NewRelic.Agent.Api" Version="8.33.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="NewRelic.Agent.Api" Version="9.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
<PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
</ItemGroup>

Expand Down