From d1e4f396dc605bdd2df625c74a1da300d4d7eaaa Mon Sep 17 00:00:00 2001 From: Bert Jansen Date: Wed, 27 Mar 2024 09:49:44 +0100 Subject: [PATCH] Switched to .NET 8 --- .../Authentication/AuthenticationManager.cs | 2 +- .../PnP.Scanning.Core.csproj | 22 +++++++++---------- .../PnP.Scanning.Core/Storage/Model/Cache.cs | 2 +- .../Storage/Model/ClassicACSPrincipal.cs | 2 +- .../Storage/Model/ClassicACSPrincipalSite.cs | 2 +- ...lassicACSPrincipalSiteScopedPermissions.cs | 2 +- ...ssicACSPrincipalTenantScopedPermissions.cs | 2 +- .../Storage/Model/ClassicAddIn.cs | 2 +- .../Storage/Model/ClassicExtensibility.cs | 2 +- .../Storage/Model/ClassicInfoPath.cs | 2 +- .../Storage/Model/ClassicList.cs | 2 +- .../Storage/Model/ClassicPage.cs | 2 +- .../Storage/Model/ClassicSiteSummary.cs | 2 +- .../Storage/Model/ClassicUserCustomAction.cs | 2 +- .../Storage/Model/ClassicWebSummary.cs | 2 +- .../Storage/Model/History.cs | 2 +- .../Storage/Model/Property.cs | 2 +- .../Storage/Model/SiteCollection.cs | 2 +- .../Storage/Model/SyntexContentType.cs | 4 ++-- .../Storage/Model/SyntexContentTypeField.cs | 2 +- .../Storage/Model/SyntexContentTypeSummary.cs | 2 +- .../Storage/Model/SyntexField.cs | 2 +- .../Storage/Model/SyntexFileType.cs | 4 ++-- .../Storage/Model/SyntexList.cs | 2 +- .../Storage/Model/SyntexModelUsage.cs | 2 +- .../Storage/Model/SyntexTermSet.cs | 2 +- .../Storage/Model/TempClassicACSPrincipal.cs | 2 +- .../TempClassicACSPrincipalValidUntil.cs | 2 +- .../Storage/Model/TestDelay.cs | 2 +- .../PnP.Scanning.Core/Storage/Model/Web.cs | 2 +- .../Storage/Model/Workflow.cs | 2 +- .../PnP.Scanning.Process.csproj | 12 +++++----- .../Properties/PublishProfiles/linux.pubxml | 4 ++-- .../Properties/PublishProfiles/osx.pubxml | 4 ++-- .../Properties/PublishProfiles/windows.pubxml | 4 ++-- 35 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Authentication/AuthenticationManager.cs b/src/PnP.Scanning/PnP.Scanning.Core/Authentication/AuthenticationManager.cs index c52b22f..65fa2f6 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Authentication/AuthenticationManager.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Authentication/AuthenticationManager.cs @@ -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 { diff --git a/src/PnP.Scanning/PnP.Scanning.Core/PnP.Scanning.Core.csproj b/src/PnP.Scanning/PnP.Scanning.Core/PnP.Scanning.Core.csproj index 1dfa47b..6a59dd2 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/PnP.Scanning.Core.csproj +++ b/src/PnP.Scanning/PnP.Scanning.Core/PnP.Scanning.Core.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable disable 1.8.0 @@ -30,18 +30,18 @@ - - - - - + + + + + - - - - + + + + - + diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Cache.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Cache.cs index 2c37bb0..517c0b4 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Cache.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Cache.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipal.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipal.cs index 3667ce8..679f978 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipal.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipal.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSite.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSite.cs index 215694b..bacfa4f 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSite.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSite.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSiteScopedPermissions.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSiteScopedPermissions.cs index d8b6641..d7458ed 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSiteScopedPermissions.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalSiteScopedPermissions.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalTenantScopedPermissions.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalTenantScopedPermissions.cs index a50449c..1fcdfe1 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalTenantScopedPermissions.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicACSPrincipalTenantScopedPermissions.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicAddIn.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicAddIn.cs index 5e95403..34bb56b 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicAddIn.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicAddIn.cs @@ -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 { /// diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicExtensibility.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicExtensibility.cs index 8b68cb9..8c8e159 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicExtensibility.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicExtensibility.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicInfoPath.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicInfoPath.cs index 7276579..e739c76 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicInfoPath.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicInfoPath.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicList.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicList.cs index 5c7c517..4fb667b 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicList.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicList.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicPage.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicPage.cs index d92467b..ac7247e 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicPage.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicPage.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicSiteSummary.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicSiteSummary.cs index 71d7951..d45f32e 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicSiteSummary.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicSiteSummary.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicUserCustomAction.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicUserCustomAction.cs index d9b987c..da20f81 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicUserCustomAction.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicUserCustomAction.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicWebSummary.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicWebSummary.cs index 2630e1c..ebef738 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicWebSummary.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/ClassicWebSummary.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/History.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/History.cs index a9c8401..fb8cded 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/History.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/History.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Property.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Property.cs index b919fda..d9674a9 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Property.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Property.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SiteCollection.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SiteCollection.cs index 9b39932..e518716 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SiteCollection.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SiteCollection.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentType.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentType.cs index a2d6ebb..6edd994 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentType.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentType.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeField.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeField.cs index 7ccb398..5cfaaed 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeField.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeField.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeSummary.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeSummary.cs index 183135c..660a4b4 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeSummary.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexContentTypeSummary.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexField.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexField.cs index 3ceac4f..f97fd34 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexField.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexField.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexFileType.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexFileType.cs index 06dea89..658ff51 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexFileType.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexFileType.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexList.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexList.cs index 87884c8..34051ca 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexList.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexList.cs @@ -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 diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexModelUsage.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexModelUsage.cs index c50f9ef..99f0eb0 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexModelUsage.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexModelUsage.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexTermSet.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexTermSet.cs index c45c8d9..9dfc12a 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexTermSet.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/SyntexTermSet.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipal.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipal.cs index cf2b6be..ff6dd74 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipal.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipal.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipalValidUntil.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipalValidUntil.cs index ffb633a..ec253d1 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipalValidUntil.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TempClassicACSPrincipalValidUntil.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TestDelay.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TestDelay.cs index 89cf437..fa143f7 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TestDelay.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/TestDelay.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Web.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Web.cs index e25b358..0c8b9e4 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Web.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Web.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Workflow.cs b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Workflow.cs index e6a15de..3549a05 100644 --- a/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Workflow.cs +++ b/src/PnP.Scanning/PnP.Scanning.Core/Storage/Model/Workflow.cs @@ -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; } diff --git a/src/PnP.Scanning/PnP.Scanning.Process/PnP.Scanning.Process.csproj b/src/PnP.Scanning/PnP.Scanning.Process/PnP.Scanning.Process.csproj index 37477e6..dbf3dd0 100644 --- a/src/PnP.Scanning/PnP.Scanning.Process/PnP.Scanning.Process.csproj +++ b/src/PnP.Scanning/PnP.Scanning.Process/PnP.Scanning.Process.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable disable microsoft365-assessment @@ -11,15 +11,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/linux.pubxml b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/linux.pubxml index d0d8bb0..9467ca5 100644 --- a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/linux.pubxml +++ b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/linux.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net6.0\publish\linux-x64\ + bin\Release\net8.0\publish\linux-x64\ FileSystem - net6.0 + net8.0 linux-x64 true true diff --git a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/osx.pubxml b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/osx.pubxml index 61c609a..c455c88 100644 --- a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/osx.pubxml +++ b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/osx.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net6.0\publish\osx-x64\ + bin\Release\net8.0\publish\osx-x64\ FileSystem - net6.0 + net8.0 osx-x64 true true diff --git a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/windows.pubxml b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/windows.pubxml index 7bb529a..61e7c11 100644 --- a/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/windows.pubxml +++ b/src/PnP.Scanning/PnP.Scanning.Process/Properties/PublishProfiles/windows.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net6.0\publish\win-x64\ + bin\Release\net8.0\publish\win-x64\ FileSystem - net6.0 + net8.0 win-x64 true true