From eacdac362722034bac0db29a402554db61f50339 Mon Sep 17 00:00:00 2001 From: "Albert.Ong" Date: Wed, 12 Feb 2020 17:20:15 -0800 Subject: [PATCH] sitecore 9.3 solution upgrade first commit --- ...rightcove.MediaFramework.Brightcove.csproj | 36 +++--- .../packages.config | 16 +-- .../Sitecore.MediaFramework.Migration.csproj | 9 +- .../packages.config | 2 +- .../Sitecore.MediaFramework.Mvc.csproj | 13 ++- .../packages.config | 4 +- .../Sitecore.MediaFramework.csproj | 103 ++++++++++-------- .../References/FieldReferenceSynchronizer.cs | 2 +- src/Sitecore.MediaFramework/packages.config | 49 +++++---- src/Web/Web.csproj | 9 +- src/Web/packages.config | 2 +- 11 files changed, 136 insertions(+), 109 deletions(-) diff --git a/src/Brightcove.MediaFramework.Brightcove/Brightcove.MediaFramework.Brightcove.csproj b/src/Brightcove.MediaFramework.Brightcove/Brightcove.MediaFramework.Brightcove.csproj index a8f3d211..f88c4cda 100644 --- a/src/Brightcove.MediaFramework.Brightcove/Brightcove.MediaFramework.Brightcove.csproj +++ b/src/Brightcove.MediaFramework.Brightcove/Brightcove.MediaFramework.Brightcove.csproj @@ -77,37 +77,37 @@ ..\packages\RestSharp.104.2.0\lib\net4\RestSharp.dll True - - ..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll + + ..\packages\Sitecore.Analytics.9.3.0\lib\net471\Sitecore.Analytics.dll - - ..\packages\Sitecore.Analytics.Core.9.2.0\lib\net471\Sitecore.Analytics.Core.dll + + ..\packages\Sitecore.Analytics.Core.9.3.0\lib\net471\Sitecore.Analytics.Core.dll - - ..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll + + ..\packages\Sitecore.Analytics.Model.9.3.0\lib\net471\Sitecore.Analytics.Model.dll - - ..\packages\Sitecore.ContentSearch.9.2.0\lib\net471\Sitecore.ContentSearch.dll + + ..\packages\Sitecore.ContentSearch.9.3.0\lib\net471\Sitecore.ContentSearch.dll - - ..\packages\Sitecore.ContentSearch.Linq.9.2.0\lib\net471\Sitecore.ContentSearch.Linq.dll + + ..\packages\Sitecore.ContentSearch.Linq.9.3.0\lib\net471\Sitecore.ContentSearch.Linq.dll ..\packages\Sitecore.Integration.Common.NoReferences.2.2.160927\lib\NET452\Sitecore.Integration.Common.dll True - - ..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll - - ..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll + + ..\packages\Sitecore.Mvc.9.3.0\lib\net471\Sitecore.Mvc.dll False ..\Lib\Sitecore\Sitecore.RestSharp.dll - - ..\packages\Sitecore.Services.Infrastructure.9.2.0\lib\net471\Sitecore.Services.Infrastructure.dll + + ..\packages\Sitecore.Services.Infrastructure.9.3.0\lib\net471\Sitecore.Services.Infrastructure.dll @@ -117,11 +117,15 @@ + + + + diff --git a/src/Brightcove.MediaFramework.Brightcove/packages.config b/src/Brightcove.MediaFramework.Brightcove/packages.config index f9c1d533..970debfc 100644 --- a/src/Brightcove.MediaFramework.Brightcove/packages.config +++ b/src/Brightcove.MediaFramework.Brightcove/packages.config @@ -6,13 +6,13 @@ - - - - - + + + + + - - - + + + \ No newline at end of file diff --git a/src/Sitecore.MediaFramework.Migration/Sitecore.MediaFramework.Migration.csproj b/src/Sitecore.MediaFramework.Migration/Sitecore.MediaFramework.Migration.csproj index 99b2e89f..df880100 100644 --- a/src/Sitecore.MediaFramework.Migration/Sitecore.MediaFramework.Migration.csproj +++ b/src/Sitecore.MediaFramework.Migration/Sitecore.MediaFramework.Migration.csproj @@ -38,8 +38,8 @@ ..\packages\Sitecore.Integration.Common.NoReferences.2.1.150625\lib\NET45\Sitecore.Integration.Common.dll - - ..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll @@ -48,9 +48,14 @@ + + + + + diff --git a/src/Sitecore.MediaFramework.Migration/packages.config b/src/Sitecore.MediaFramework.Migration/packages.config index d0310d6e..f6d0cf1e 100644 --- a/src/Sitecore.MediaFramework.Migration/packages.config +++ b/src/Sitecore.MediaFramework.Migration/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/Sitecore.MediaFramework.Mvc/Sitecore.MediaFramework.Mvc.csproj b/src/Sitecore.MediaFramework.Mvc/Sitecore.MediaFramework.Mvc.csproj index d6bd4ecf..f94c3b2f 100644 --- a/src/Sitecore.MediaFramework.Mvc/Sitecore.MediaFramework.Mvc.csproj +++ b/src/Sitecore.MediaFramework.Mvc/Sitecore.MediaFramework.Mvc.csproj @@ -44,11 +44,11 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll - - ..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll + + ..\packages\Sitecore.Mvc.9.3.0\lib\net471\Sitecore.Mvc.dll @@ -57,9 +57,14 @@ + + + + + diff --git a/src/Sitecore.MediaFramework.Mvc/packages.config b/src/Sitecore.MediaFramework.Mvc/packages.config index 4dac073e..7d2190a2 100644 --- a/src/Sitecore.MediaFramework.Mvc/packages.config +++ b/src/Sitecore.MediaFramework.Mvc/packages.config @@ -4,6 +4,6 @@ - - + + \ No newline at end of file diff --git a/src/Sitecore.MediaFramework/Sitecore.MediaFramework.csproj b/src/Sitecore.MediaFramework/Sitecore.MediaFramework.csproj index 1c883b02..1210c93d 100644 --- a/src/Sitecore.MediaFramework/Sitecore.MediaFramework.csproj +++ b/src/Sitecore.MediaFramework/Sitecore.MediaFramework.csproj @@ -56,81 +56,84 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll + + ..\packages\Sitecore.Analytics.9.3.0\lib\net471\Sitecore.Analytics.dll - - ..\packages\Sitecore.Analytics.Aggregation.9.2.0\lib\net471\Sitecore.Analytics.Aggregation.dll + + ..\packages\Sitecore.Analytics.Aggregation.9.3.0\lib\net471\Sitecore.Analytics.Aggregation.dll - - ..\packages\Sitecore.Analytics.Core.9.2.0\lib\net471\Sitecore.Analytics.Core.dll + + ..\packages\Sitecore.Analytics.Core.9.3.0\lib\net471\Sitecore.Analytics.Core.dll - - ..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll + + ..\packages\Sitecore.Analytics.Model.9.3.0\lib\net471\Sitecore.Analytics.Model.dll - - ..\packages\Sitecore.Buckets.9.2.0\lib\net471\Sitecore.Buckets.dll + + ..\packages\Sitecore.Buckets.9.3.0\lib\net471\Sitecore.Buckets.dll - - ..\packages\Sitecore.Client.9.2.0\lib\net471\Sitecore.Client.dll + + ..\packages\Sitecore.Client.9.3.0\lib\net471\Sitecore.Client.dll - - ..\packages\Sitecore.ContentSearch.9.2.0\lib\net471\Sitecore.ContentSearch.dll + + ..\packages\Sitecore.ContentSearch.9.3.0\lib\net471\Sitecore.ContentSearch.dll - - ..\packages\Sitecore.ContentSearch.Linq.9.2.0\lib\net471\Sitecore.ContentSearch.Linq.dll + + ..\packages\Sitecore.ContentSearch.Linq.9.3.0\lib\net471\Sitecore.ContentSearch.Linq.dll - - ..\packages\Sitecore.ExperienceAnalytics.Aggregation.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.Aggregation.dll + + ..\packages\Sitecore.ExperienceAnalytics.Aggregation.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Aggregation.dll - - ..\packages\Sitecore.ExperienceAnalytics.Api.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.Api.dll + + ..\packages\Sitecore.ExperienceAnalytics.Api.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Api.dll - - ..\packages\Sitecore.ExperienceAnalytics.Client.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.Client.dll + + ..\packages\Sitecore.ExperienceAnalytics.Client.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Client.dll - - ..\packages\Sitecore.ExperienceAnalytics.Core.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.Core.dll + + ..\packages\Sitecore.ExperienceAnalytics.Core.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Core.dll - - ..\packages\Sitecore.ExperienceAnalytics.ReAggregation.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.ReAggregation.dll + + ..\packages\Sitecore.ExperienceAnalytics.ReAggregation.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.ReAggregation.dll - - ..\packages\Sitecore.ExperienceAnalytics.Reduce.9.2.0\lib\net471\Sitecore.ExperienceAnalytics.Reduce.dll + + ..\packages\Sitecore.ExperienceAnalytics.Reduce.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Reduce.dll ..\packages\Sitecore.Integration.Common.NoReferences.2.2.160927\lib\NET452\Sitecore.Integration.Common.dll True - - ..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll - - ..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll + + ..\packages\Sitecore.Mvc.9.3.0\lib\net471\Sitecore.Mvc.dll - - ..\packages\Sitecore.Services.Infrastructure.9.2.0\lib\net471\Sitecore.Services.Infrastructure.dll + + ..\packages\Sitecore.Services.Infrastructure.9.3.0\lib\net471\Sitecore.Services.Infrastructure.dll - - ..\packages\Sitecore.Speak.Client.9.2.0\lib\net471\Sitecore.Speak.Client.dll + + ..\packages\Sitecore.Speak.Client.9.3.0\lib\net471\Sitecore.Speak.Client.dll - - ..\packages\Sitecore.XConnect.9.2.0\lib\netstandard2.0\Sitecore.XConnect.dll + + ..\packages\Sitecore.XConnect.9.3.0\lib\netstandard2.0\Sitecore.XConnect.dll - - ..\packages\Sitecore.Xdb.Client.9.2.0\lib\net471\Sitecore.Xdb.Client.dll + + ..\packages\Sitecore.XConnect.Core.9.3.0\lib\netstandard2.0\Sitecore.XConnect.Core.dll - - ..\packages\Sitecore.Xdb.Configuration.9.2.0\lib\net471\Sitecore.Xdb.Configuration.dll + + ..\packages\Sitecore.Xdb.Client.9.3.0\lib\net471\Sitecore.Xdb.Client.dll - - ..\packages\Sitecore.Xdb.MarketingAutomation.ReportingClient.9.2.0\lib\net471\Sitecore.Xdb.MarketingAutomation.ReportingClient.dll + + ..\packages\Sitecore.Xdb.Configuration.9.3.0\lib\net471\Sitecore.Xdb.Configuration.dll - - ..\packages\Sitecore.Xdb.MarketingAutomation.ReportingClient.Configuration.9.2.0\lib\net471\Sitecore.Xdb.MarketingAutomation.ReportingClient.Configuration.dll + + ..\packages\Sitecore.Xdb.MarketingAutomation.ReportingClient.9.3.0\lib\net471\Sitecore.Xdb.MarketingAutomation.ReportingClient.dll - - ..\packages\Sitecore.Xdb.Reporting.9.2.0\lib\net471\Sitecore.Xdb.Reporting.dll + + ..\packages\Sitecore.Xdb.MarketingAutomation.ReportingClient.Configuration.9.3.0\lib\net471\Sitecore.Xdb.MarketingAutomation.ReportingClient.Configuration.dll + + + ..\packages\Sitecore.Xdb.Reporting.9.3.0\lib\net471\Sitecore.Xdb.Reporting.dll @@ -142,14 +145,18 @@ + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll + + + diff --git a/src/Sitecore.MediaFramework/Synchronize/References/FieldReferenceSynchronizer.cs b/src/Sitecore.MediaFramework/Synchronize/References/FieldReferenceSynchronizer.cs index 752792a9..375c866a 100644 --- a/src/Sitecore.MediaFramework/Synchronize/References/FieldReferenceSynchronizer.cs +++ b/src/Sitecore.MediaFramework/Synchronize/References/FieldReferenceSynchronizer.cs @@ -19,7 +19,7 @@ public virtual Item SyncReference(object entity, Item accountItem, Item item) return null; } - if (!field.CanWrite) + if (!field.CanUserWrite(Context.User)) { LogHelper.Warn(string.Format("Field {0} from item({1}) does not have write permissions", field.Name, field.Item.ID), this); diff --git a/src/Sitecore.MediaFramework/packages.config b/src/Sitecore.MediaFramework/packages.config index 14e4f75f..c71b53ed 100644 --- a/src/Sitecore.MediaFramework/packages.config +++ b/src/Sitecore.MediaFramework/packages.config @@ -7,29 +7,30 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 63947d84..1d62c977 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -69,18 +69,23 @@ ..\Lib\Sitecore\Sitecore.Integration.Common.dll - - ..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll + + + + + diff --git a/src/Web/packages.config b/src/Web/packages.config index c50bd2f7..b92105f7 100644 --- a/src/Web/packages.config +++ b/src/Web/packages.config @@ -7,7 +7,7 @@ - + \ No newline at end of file