Skip to content

Commit 5e49bf8

Browse files
committed
Fixed T4 template errors in test project after changing MultipleOutputHelper.ttinclude.
The change to MultipleOutputHelper.ttinclude was necessary to support outputting to parent folder (using ..\..\ in path). However, this change also made environment variables such as $(SolutionDir) no longer work. * Replaced file include paths with proper relative paths. * Removed duplicate assembly and namespace imports.
1 parent 2693c24 commit 5e49bf8

File tree

5 files changed

+6
-23
lines changed

5 files changed

+6
-23
lines changed

Tests/Generated Code/Includes/UnitConverterTests.ttinclude

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<#@ import namespace="System.Collections.Generic" #>
77
<#@ import namespace="UnitsNet" #>
88
<#@ import namespace="MoreLinq" #>
9-
<#@ include file="$(SolutionDir)\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #><#+
9+
<#@ include file="..\..\..\Src\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #><#+
1010

1111
private void GenerateUnitConverterTests(Dictionary<Unit, UnitAttribute> unitToAttribute)
1212
{

Tests/Generated Code/Includes/UnitTestClass.ttinclude

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<#@ import namespace="UnitsNet" #>
77
<#@ import namespace="UnitsNet.Attributes" #>
88
<#@ import namespace="UnitsNet.Extensions" #>
9-
<#@ include file="$(SolutionDir)\UnitsNet\Generated Code\Includes\MultipleOutputHelper.ttinclude" once="true"#>
10-
<#@ include file="$(SolutionDir)\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #><#+
9+
<#@ include file="..\..\..\Src\UnitsNet\Generated Code\Includes\MultipleOutputHelper.ttinclude" once="true"#>
10+
<#@ include file="..\..\..\Src\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #><#+
1111

1212
private void GenerateTestClass(Type unitAttributeType, Manager manager, string className, Unit baseUnit)
1313
{

Tests/Generated Code/UnitConverterTests.tt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<#@ template debug="True" language="C#" hostspecific="True" #>
2-
<#@ assembly name="$(TargetDir)UnitsNet.net35.dll" #>
32
<#@ assembly name="System.Core" #>
43
<#@ import namespace="System.Linq" #>
54
<#@ import namespace="System.Collections.Generic" #>
6-
<#@ import namespace="UnitsNet" #>
75
<#@ include file="Includes\UnitConverterTests.ttinclude" once="true" #>
86
<#@ output extension=".g.cs" #>
97
<#
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
<#@ template debug="True" language="C#" hostspecific="True" #>
2-
<#@ assembly name="$(TargetDir)UnitsNet.net35.dll" #>
3-
<#@ assembly name="System.Core" #>
4-
<#@ import namespace="System.Linq" #>
5-
<#@ import namespace="System.Text" #>
6-
<#@ import namespace="System.Collections.Generic" #>
72
<#@ include file="Includes\UnitTestClass.ttinclude" once="true"#>
8-
<#
9-
// This causes a duplicate definition error because UnitClass.ttinclude also includes it:
10-
// @ include file="MultipleOutputHelper.ttinclude" once="true" #>
11-
<# // Disable output of this file, note this causes a build warning #>
12-
<#@ output extension="/" #>
13-
<#//@ output extension=".cs" #>
3+
<#@ output extension=".txt" #>
144
<#
155

166
var m = Manager.Create(Host, GenerationEnvironment);
@@ -25,4 +15,4 @@
2515
}
2616

2717
m.Process(split: true);
28-
#>
18+
#>

Tests/Generated Code/UnitValueTests.tt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<#@ template debug="True" language="C#" hostspecific="True" #>
2-
<#@ assembly name="$(TargetDir)UnitsNet.net35.dll" #>
3-
<#@ assembly name="System.Core" #>
4-
<#@ import namespace="System.Linq" #>
5-
<#@ import namespace="System.Collections.Generic" #>
6-
<#@ import namespace="UnitsNet" #>
7-
<#@ include file="$(SolutionDir)\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #>
2+
<#@ include file="..\..\Src\UnitsNet\Generated Code\Includes\Shared.ttinclude" once="true" #>
83
<#@ include file="Includes\UnitValueTests.ttinclude" once="true" #>
94
<#@ output extension=".g.cs" #>
105
<#

0 commit comments

Comments
 (0)