Browse Source

Update ASP.NET MVC addin to support T4 addin changes.

pull/18/head
Matt Ward 14 years ago
parent
commit
d67be30325
  1. 6
      src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs
  2. 7
      src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs
  3. 2
      src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs
  4. 4
      src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs

6
src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateAssemblyResolver.cs

@ -9,9 +9,13 @@ namespace ICSharpCode.AspNet.Mvc
[Serializable] [Serializable]
public class MvcTextTemplateAssemblyResolver : ITextTemplatingAssemblyResolver public class MvcTextTemplateAssemblyResolver : ITextTemplatingAssemblyResolver
{ {
public string Resolve(string assemblyReference) public string ResolvePath(string assemblyReference)
{ {
return assemblyReference; return assemblyReference;
} }
public void Dispose()
{
}
} }
} }

7
src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/MvcTextTemplateHost.cs

@ -22,7 +22,12 @@ namespace ICSharpCode.AspNet.Mvc
ITextTemplatingAppDomainFactory appDomainFactory, ITextTemplatingAppDomainFactory appDomainFactory,
ITextTemplatingAssemblyResolver assemblyResolver, ITextTemplatingAssemblyResolver assemblyResolver,
string applicationBase) string applicationBase)
: base(appDomainFactory, assemblyResolver, applicationBase) : this(new TextTemplatingHostContext(appDomainFactory, assemblyResolver, null, null), applicationBase)
{
}
public MvcTextTemplateHost(TextTemplatingHostContext context, string applicationBase)
: base(context, applicationBase)
{ {
AddAssemblyReferenceForMvcHost(); AddAssemblyReferenceForMvcHost();
AddImports(); AddImports();

2
src/AddIns/BackendBindings/AspNet.Mvc/Test/Helpers/TestableProject.cs

@ -27,7 +27,7 @@ namespace AspNet.Mvc.Tests.Helpers
public static TestableProject CreateProject(string fileName, string projectName) public static TestableProject CreateProject(string fileName, string projectName)
{ {
var createInfo = new ProjectCreateInformation(); var createInfo = new ProjectCreateInformation();
createInfo.Solution = new Solution(); createInfo.Solution = new Solution(null);
createInfo.ProjectName = projectName; createInfo.ProjectName = projectName;
createInfo.OutputProjectFileName = fileName; createInfo.OutputProjectFileName = fileName;
return new TestableProject(createInfo); return new TestableProject(createInfo);

4
src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/MvcTextTemplateAssemblyResolverTests.cs

@ -18,12 +18,12 @@ namespace AspNet.Mvc.Tests
} }
[Test] [Test]
public void Resolve_FullPathToAssemblyPassed_ReturnsFullPathToAssembly() public void ResolvePath_FullPathToAssemblyPassed_ReturnsFullPathToAssembly()
{ {
CreateResolver(); CreateResolver();
string expectedAssemblyPath = @"d:\projects\MyProject\bin\debug\MyProject.dll"; string expectedAssemblyPath = @"d:\projects\MyProject\bin\debug\MyProject.dll";
string resolvedAssemblyPath = resolver.Resolve(expectedAssemblyPath); string resolvedAssemblyPath = resolver.ResolvePath(expectedAssemblyPath);
Assert.AreEqual(expectedAssemblyPath, resolvedAssemblyPath); Assert.AreEqual(expectedAssemblyPath, resolvedAssemblyPath);
} }

Loading…
Cancel
Save