Skip to content

WEB-232 Update Sitecore Back end solution to 9.3 #1

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
vincentlui-alinta wants to merge 5 commits into
base: master
Choose a base branch
from
Open

WEB-232 Update Sitecore Back end solution to 9.3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a931da
Updating nuget references to stop using the noreferences packages
Apr 27, 2020
139d83b
Update .Net Target Framework to 4.8
Apr 27, 2020
f8f12cc
Upgraded Nuget Packages to Sitecore 9.3
Apr 27, 2020
ec05f25
Removed Nuget package not in use for 9.3
Apr 27, 2020
c1d23c4
Fixing all 9.3 build issues
Apr 27, 2020
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
8 changes: 5 additions & 3 deletions .nuget/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<add key="Nuget v2" value="https://www.nuget.org/api/v2" />
<add key="Nuget v3" value="https://api.nuget.org/v3/index.json" />
<add key="Sitecore Sc-pacakages" value="https://sitecore.myget.org/F/sc-packages/api/v3/index.json" />
</packageSources>
</configuration>
3 changes: 2 additions & 1 deletion Hi.UrlRewrite.Tests/Hi.UrlRewrite.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Hi.UrlRewrite.Tests</RootNamespace>
<AssemblyName>Hi.UrlRewrite.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand All @@ -18,6 +18,7 @@
<TestProjectType>UnitTest</TestProjectType>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
4 changes: 2 additions & 2 deletions Hi.UrlRewrite.Tests/OutboundRewriterTestData.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions Hi.UrlRewrite/Analytics/ByUrlRewriteRedirect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
using Sitecore.Analytics.Aggregation.Data.Model;
using Sitecore.Analytics.Model;
using Sitecore.Analytics.Model;
using Sitecore.Diagnostics;
using Sitecore.ExperienceAnalytics.Aggregation.Data.Model;
using Sitecore.ExperienceAnalytics.Aggregation.Data.Schema;
using Sitecore.ExperienceAnalytics.Aggregation.Dimensions;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace Hi.UrlRewrite.Analytics
{
Expand Down
64 changes: 30 additions & 34 deletions Hi.UrlRewrite/Hi.UrlRewrite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Hi.UrlRewrite</RootNamespace>
<AssemblyName>Hi.UrlRewrite</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand All @@ -25,6 +25,7 @@
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -44,59 +45,54 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Analytics.NoReferences.8.2.160729\lib\NET452\Sitecore.Analytics.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.Analytics, Version=14.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.Analytics.9.3.0\lib\net471\Sitecore.Analytics.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Aggregation, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Analytics.Aggregation.NoReferences.8.2.160729\lib\NET452\Sitecore.Analytics.Aggregation.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.Analytics.Core, Version=14.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.Analytics.Core.9.3.0\lib\net471\Sitecore.Analytics.Core.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Analytics.Core.NoReferences.8.2.160729\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.Analytics.Model, Version=14.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.Analytics.Model.9.3.0\lib\net471\Sitecore.Analytics.Model.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Analytics.Model.NoReferences.8.2.160729\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.ExperienceAnalytics.Aggregation, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.ExperienceAnalytics.Aggregation.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Aggregation.dll</HintPath>
</Reference>
<Reference Include="Sitecore.ExperienceAnalytics, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.ExperienceAnalytics.NoReferences.8.2.160729\lib\NET452\Sitecore.ExperienceAnalytics.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.ExperienceAnalytics.Core, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.ExperienceAnalytics.Core.9.3.0\lib\net471\Sitecore.ExperienceAnalytics.Core.dll</HintPath>
</Reference>
<Reference Include="Sitecore.ExperienceAnalytics.Aggregation, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.ExperienceAnalytics.Aggregation.NoReferences.8.2.160729\lib\NET452\Sitecore.ExperienceAnalytics.Aggregation.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.Kernel, Version=14.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll</HintPath>
</Reference>
<Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Kernel.NoReferences.8.2.160729\lib\NET452\Sitecore.Kernel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sitecore.Logging.NoReferences.8.2.160729\lib\NET452\Sitecore.Logging.dll</HintPath>
<Private>True</Private>
<Reference Include="Sitecore.Logging, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sitecore.Logging.9.3.0\lib\net471\Sitecore.Logging.dll</HintPath>
</Reference>
<Reference Include="sysglobl" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Design" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.IO.FileSystem.Primitives" />
<Reference Include="System.Linq" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.InteropServices" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Threading.Thread" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
Expand Down
12 changes: 5 additions & 7 deletions Hi.UrlRewrite/Processing/InboundRewriteProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Web;

namespace Hi.UrlRewrite.Processing
{
Expand All @@ -22,23 +21,22 @@ public override void Process(HttpRequestArgs args)
try
{

if (args.Context == null || db == null) return;
if (args.HttpContext == null || db == null) return;

var httpContext = new HttpContextWrapper(args.Context);
var requestUri = httpContext.Request.Url;
var requestUri = args.HttpContext.Request.Url;

if (requestUri == null || Configuration.IgnoreUrlPrefixes.Length > 0 && Configuration.IgnoreUrlPrefixes.Any(prefix => requestUri.PathAndQuery.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase)))
{
return;
}

var urlRewriter = new InboundRewriter(httpContext.Request.ServerVariables, httpContext.Request.Headers);
var urlRewriter = new InboundRewriter(args.HttpContext.Request.ServerVariables, args.HttpContext.Request.Headers);
var requestResult = ProcessUri(requestUri, db, urlRewriter);

if (requestResult == null || !requestResult.MatchedAtLeastOneRule) return;

httpContext.Items["urlrewrite:db"] = db.Name;
httpContext.Items["urlrewrite:result"] = requestResult;
args.HttpContext.Items["urlrewrite:db"] = db.Name;
args.HttpContext.Items["urlrewrite:result"] = requestResult;

var urlRewriterItem = Sitecore.Context.Database.GetItem(new ID(Constants.UrlRewriter_ItemId));
if (urlRewriterItem != null)
Expand Down
2 changes: 1 addition & 1 deletion Hi.UrlRewrite/Processing/UrlRewriteHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void ProcessRequest(HttpContext context)
try
{
var urlRewriteProcessor = new InboundRewriteProcessor();
var requestArgs = new HttpRequestArgs(context, HttpRequestType.Begin);
var requestArgs = new HttpRequestArgs(new HttpContextWrapper(context), HttpRequestType.Begin);
var requestUri = context.Request.Url;

var siteContext = SiteContextFactory.GetSiteContext(requestUri.Host, requestUri.AbsolutePath,
Expand Down
14 changes: 7 additions & 7 deletions Hi.UrlRewrite/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<packages>
<package id="bootstrap" version="3.3.1" targetFramework="net45" />
<package id="jQuery" version="1.9.0" targetFramework="net45" />
<package id="Sitecore.Analytics.Core.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.Model.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.ExperienceAnalytics.Aggregation.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.ExperienceAnalytics.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Kernel.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Logging.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
<package id="Sitecore.Analytics" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Analytics.Core" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Analytics.Model" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.ExperienceAnalytics.Aggregation" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.ExperienceAnalytics.Core" version="9.3.0" targetFramework="net48" />
<package id="Sitecore.Kernel" version="9.3.0" targetFramework="net48" developmentDependency="true" />
<package id="Sitecore.Logging" version="9.3.0" targetFramework="net48" developmentDependency="true" />
</packages>