Skip to content

Commit

Permalink
Switched to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
jansenbe committed Mar 27, 2024
1 parent 7201787 commit d1e4f39
Show file tree
Hide file tree
Showing 35 changed files with 55 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private ConfidentialClientApplicationBuilder GetBuilderWithAuthority(Confidentia
var azureADEndPoint = $"https://{CloudManager.GetAzureADLoginAuthority(azureEnvironment)}";
if (!string.IsNullOrEmpty(tenantId))
{
builder = builder.WithAuthority($"{azureADEndPoint}/organizations", tenantId);
builder = builder.WithTenantId(tenantId).WithAuthority($"{azureADEndPoint}/organizations", tenantId);
}
else
{
Expand Down
22 changes: 11 additions & 11 deletions src/PnP.Scanning/PnP.Scanning.Core/PnP.Scanning.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<Version>1.8.0</Version>
Expand Down Expand Up @@ -30,18 +30,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="EFCore.BulkExtensions" Version="6.5.0" />
<PackageReference Include="envdte" Version="17.6.36389" />
<PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="CsvHelper" Version="31.0.2" />
<PackageReference Include="EFCore.BulkExtensions" Version="8.0.2" />
<PackageReference Include="envdte" Version="17.9.37000" />
<PackageReference Include="Grpc.AspNetCore" Version="2.61.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
<PackageReference Include="Microsoft.SharePointOnline.CSOM" Version="16.1.23814.12000" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
<PackageReference Include="Microsoft.SharePointOnline.CSOM" Version="16.1.24614.12000" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Cache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(Key) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(Key)], IsUnique = true)]
internal sealed class Cache
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier)], IsUnique = true)]
internal class ClassicACSPrincipal
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier), nameof(ServerRelativeUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier), nameof(ServerRelativeUrl)], IsUnique = true)]
internal class ClassicACSPrincipalSite
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier), nameof(ServerRelativeUrl), nameof(SiteId), nameof(WebId), nameof(ListId), nameof(Right) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier), nameof(ServerRelativeUrl), nameof(SiteId), nameof(WebId), nameof(ListId), nameof(Right)], IsUnique = true)]
internal class ClassicACSPrincipalSiteScopedPermissions
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier), nameof(ProductFeature), nameof(Scope), nameof(Right), nameof(ResourceId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier), nameof(ProductFeature), nameof(Scope), nameof(Right), nameof(ResourceId)], IsUnique = true)]
internal class ClassicACSPrincipalTenantScopedPermissions
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(AppInstanceId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(AppInstanceId)], IsUnique = true)]
internal class ClassicAddIn : BaseScanResult
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl)], IsUnique = true)]
internal class ClassicExtensibility : BaseScanResult
{
public bool UsesCustomMasterPage { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId)], IsUnique = true)]
internal class ClassicInfoPath : BaseScanResult
{
public string ListUrl { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId)], IsUnique = true)]
internal class ClassicList : BaseScanResult
{
public Guid ListId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(PageUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(PageUrl)], IsUnique = true)]
internal class ClassicPage : BaseScanResult
{
public string PageUrl { get; set; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace PnP.Scanning.Core.Storage
{
[Microsoft.EntityFrameworkCore.Index(new string[] { nameof(ScanId), nameof(SiteUrl) }, IsUnique = true)]
[Microsoft.EntityFrameworkCore.Index(nameof(ScanId), [nameof(SiteUrl)], IsUnique = true)]
internal sealed class ClassicSiteSummary
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(Id) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(Id)], IsUnique = true)]
internal class ClassicUserCustomAction : BaseScanResult
{
public Guid Id { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl)], IsUnique = true)]
internal class ClassicWebSummary : BaseScanResult
{
public string Template { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(Event), nameof(EventDate) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(Event), nameof(EventDate)], IsUnique = true)]
internal sealed class History
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(Name) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(Name)], IsUnique = true)]
internal sealed class Property
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Microsoft.EntityFrameworkCore.Index(new string[] { nameof(ScanId), nameof(SiteUrl) }, IsUnique = true)]
[Microsoft.EntityFrameworkCore.Index(nameof(ScanId), [nameof(SiteUrl)], IsUnique = true)]
internal sealed class SiteCollection
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(ContentTypeId) }, IsUnique = true)]
[Index(new string[] { nameof(ScanId), nameof(ContentTypeId) })]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(ContentTypeId)], IsUnique = true)]
[Index(nameof(ScanId), [nameof(ContentTypeId)])]
internal sealed class SyntexContentType: BaseScanResult
{
public Guid ListId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(ContentTypeId), nameof(FieldId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(ContentTypeId), nameof(FieldId)], IsUnique = true)]
internal sealed class SyntexContentTypeField: BaseScanResult
{
public Guid ListId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(ContentTypeId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(ContentTypeId)], IsUnique = true)]
internal sealed class SyntexContentTypeSummary
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(FieldId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(FieldId)], IsUnique = true)]
internal sealed class SyntexField : BaseScanResult
{
public Guid ListId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(FileType) }, IsUnique = true)]
[Index(new string[] { nameof(ScanId), nameof(FileType) })]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId), nameof(FileType)], IsUnique = true)]
[Index(nameof(ScanId), [nameof(FileType)])]
internal sealed class SyntexFileType: BaseScanResult
{
public Guid ListId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(ListId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(ListId)], IsUnique = true)]
internal sealed class SyntexList : BaseScanResult
{
#region List identification information
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(Classifier), nameof(TargetSiteId), nameof(TargetWebId), nameof(TargetListId) })]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(Classifier), nameof(TargetSiteId), nameof(TargetWebId), nameof(TargetListId)])]
internal sealed class SyntexModelUsage: BaseScanResult
{
public string Classifier { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(TermSetId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(TermSetId)], IsUnique = true)]
internal sealed class SyntexTermSet
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier), nameof(ServerRelativeUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier), nameof(ServerRelativeUrl)], IsUnique = true)]
internal class TempClassicACSPrincipal
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(AppIdentifier) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(AppIdentifier)], IsUnique = true)]
internal class TempClassicACSPrincipalValidUntil
{
public Guid ScanId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl)], IsUnique = true)]
internal sealed class TestDelay : BaseScanResult
{
public int Delay1 { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Web.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Microsoft.EntityFrameworkCore.Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl) }, IsUnique = true)]
[Microsoft.EntityFrameworkCore.Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl)], IsUnique = true)]
internal sealed class Web : BaseScanResult
{
public string WebUrlAbsolute { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PnP.Scanning.Core.Storage
{
[Index(new string[] { nameof(ScanId), nameof(SiteUrl), nameof(WebUrl), nameof(DefinitionId), nameof(SubscriptionId) }, IsUnique = true)]
[Index(nameof(ScanId), [nameof(SiteUrl), nameof(WebUrl), nameof(DefinitionId), nameof(SubscriptionId)], IsUnique = true)]
internal class Workflow : BaseScanResult
{
public Guid DefinitionId { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyName>microsoft365-assessment</AssemblyName>
Expand All @@ -11,15 +11,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageReference Include="Spectre.Console" Version="0.44.0" />
<PackageReference Include="Spectre.Console" Version="0.47.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\publish\linux-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\linux-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\publish\osx-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\osx-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\publish\win-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\win-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
Expand Down

0 comments on commit d1e4f39

Please sign in to comment.