Skip to content
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

Jump to bottom

upgrade to sites9 #16

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

upgrade to sites9 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DD4T RestService.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<NuGetStructureFolders Include="$(BuildNugetDirectory);$(BuildNuGetFramework40Directory);$(BuildNuGetFramework45Directory);"/>
</ItemGroup>

<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" Condition="Exists('$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets')"/>

<!-- Task for retrieving ProductVersion from an Assembly -->
<UsingTask TaskName="GetInformationalVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
Expand Down
6 changes: 4 additions & 2 deletions configuration/packagecontent/content/web.config.transform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
</configSections>
<log4net debug="true">
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!-- Change the value for the file location -->
<file value="%%%%%%%" />
<appendToFile value="true" />
<rollingStyle value="Size" />
Expand All @@ -23,8 +24,9 @@
<system.webServer>
<httpErrors errorMode="Detailed" existingResponse="PassThrough" />
<validation validateIntegratedModeConfiguration="false" />
Copy link
Member

Choose a reason for hiding this comment

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

Isn't there an HttpModule for Ambient in Tridion 9?

<modules runAllManagedModulesForAllRequests="true">
<!-- uncomment the module below for use below SDL Web 8.5-->
<!-- <modules runAllManagedModulesForAllRequests="true">
<add type="Tridion.ContentDelivery.AmbientData.HttpModule" name="AmbientFrameworkModule" preCondition="managedHandler" />
</modules>
</modules> -->
</system.webServer>
</configuration>
85 changes: 36 additions & 49 deletions source/DD4T.RestService.WebApi/AppBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,45 @@
using Autofac;
using Autofac.Integration.WebApi;
using DD4T.ContentModel.Contracts.Configuration;
using DD4T.ContentModel.Contracts.Logging;
using DD4T.ContentModel.Contracts.Providers;
using DD4T.ContentModel.Contracts.Resolvers;
using DD4T.DI.Autofac;
using DD4T.Utils;
using DD4T.Utils.Logging;
using DD4T.Utils.Resolver;
using Owin;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;

namespace DD4T.RestService.WebApi
{
public static class AppBuilderExtensions
{

public static void UseDD4TWebApi(this IAppBuilder appBuilder)
{
var builder = new ContainerBuilder();
appBuilder.UseDD4TWebApi(builder);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, HttpConfiguration config)
{
var builder = new ContainerBuilder();
appBuilder.UseDD4TWebApi(builder, config);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, ContainerBuilder builder)
{
var config = new HttpConfiguration();
appBuilder.UseDD4TWebApi(builder, config);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, ContainerBuilder builder, HttpConfiguration config)
{
builder.RegisterApiControllers(typeof(AppBuilderExtensions).Assembly);
builder.UseDD4T();

var container = builder.Build();

config.DependencyResolver = new AutofacWebApiDependencyResolver(container);
config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
config.MapHttpAttributeRoutes();

appBuilder.UseAutofacMiddleware(container);
appBuilder.UseAutofacWebApi(config);
appBuilder.UseWebApi(config);
}
}
public static class AppBuilderExtensions
{
public static void UseDD4TWebApi(this IAppBuilder appBuilder)
{
var builder = new ContainerBuilder();
appBuilder.UseDD4TWebApi(builder);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, HttpConfiguration config)
{
var builder = new ContainerBuilder();
appBuilder.UseDD4TWebApi(builder, config);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, ContainerBuilder builder)
{
var config = new HttpConfiguration();
appBuilder.UseDD4TWebApi(builder, config);
}

public static void UseDD4TWebApi(this IAppBuilder appBuilder, ContainerBuilder builder, HttpConfiguration config)
{
builder.RegisterApiControllers(typeof(AppBuilderExtensions).Assembly);
builder.UseDD4T();

var container = builder.Build();

config.DependencyResolver = new AutofacWebApiDependencyResolver(container);
config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
config.MapHttpAttributeRoutes();

appBuilder.UseAutofacMiddleware(container);
appBuilder.UseAutofacWebApi(config);
appBuilder.UseWebApi(config);
}
}
}
Loading