Skip to content

Commit 41bd69b

Browse files
garethj-msftgarethj-msft
committed
Fixup merge errors
1 parent be987a2 commit 41bd69b

8 files changed

+29
-19
lines changed

‎Templates/CSharp/Requests/EntityCollectionRequest.cs.tt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
1717
using System.Collections.Generic;
1818
using System.Net.Http;
1919
using System.Threading;
20-
using System.Threading.Tasks;
2120
using System.Linq.Expressions;
2221

2322
<#=this.GetCollectionClassDefinition(prop)#>
@@ -80,8 +79,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
8079
return this;
8180
}
8281

83-
<# } #>
84-
<# if (features.CanSelect) { #>
8582
/// <summary>
8683
/// Adds the specified expand value to the request.
8784
/// </summary>
@@ -106,6 +103,8 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
106103
return this;
107104
}
108105

106+
<# } #>
107+
<# if (features.CanSelect) { #>
109108
/// <summary>
110109
/// Adds the specified select value to the request.
111110
/// </summary>
@@ -117,8 +116,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
117116
return this;
118117
}
119118

120-
<# } #>
121-
<# if (features.CanUseTop) { #>
122119
/// <summary>
123120
/// Adds the specified select value to the request.
124121
/// </summary>
@@ -143,6 +140,8 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
143140
return this;
144141
}
145142

143+
<# } #>
144+
<# if (features.CanUseTop) { #>
146145
/// <summary>
147146
/// Adds the specified top value to the request.
148147
/// </summary>

‎Templates/CSharp/Requests/EntityCollectionWithReferencesRequest.cs.tt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
2020
using System.Collections.Generic;
2121
using System.Net.Http;
2222
using System.Threading;
23-
using System.Threading.Tasks;
2423
using System.Linq.Expressions;
2524

2625
<#=this.GetCollectionWithReferencesClassDefinition(prop)#>
@@ -83,8 +82,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
8382
return this;
8483
}
8584

86-
<# } #>
87-
<# if (features.CanSelect) { #>
8885
/// <summary>
8986
/// Adds the specified expand value to the request.
9087
/// </summary>
@@ -109,6 +106,8 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
109106
return this;
110107
}
111108

109+
<# } #>
110+
<# if (features.CanSelect) { #>
112111
/// <summary>
113112
/// Adds the specified select value to the request.
114113
/// </summary>
@@ -120,8 +119,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
120119
return this;
121120
}
122121

123-
<# } #>
124-
<# if (features.CanUseTop) { #>
125122
/// <summary>
126123
/// Adds the specified select value to the request.
127124
/// </summary>
@@ -146,6 +143,8 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
146143
return this;
147144
}
148145

146+
<# } #>
147+
<# if (features.CanUseTop) { #>
149148
/// <summary>
150149
/// Adds the specified top value to the request.
151150
/// </summary>

‎Templates/CSharp/Requests/EntityRequest.cs.tt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace <#=this.GetNamespaceName(entity)#>
1717
using System.IO;
1818
using System.Net.Http;
1919
using System.Threading;
20-
using System.Threading.Tasks;
2120
using System.Linq.Expressions;
2221

2322
<#=this.GetEntityRequestClassDefinition(entity)#>

‎Templates/CSharp/Requests/EntityWithReferenceRequest.cs.tt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace <#=this.GetNamespaceName(entity)#>
1717
using System.IO;
1818
using System.Net.Http;
1919
using System.Threading;
20-
using System.Threading.Tasks;
2120
using System.Linq.Expressions;
2221

2322
<#=this.GetEntityWithReferenceRequestClassDefinition(entity)#>

‎Templates/CSharp/Requests/IEntityCollectionRequest.cs.tt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
1818
using System.Collections.Generic;
1919
using System.Net.Http;
2020
using System.Threading;
21-
using System.Threading.Tasks;
2221
using System.Linq.Expressions;
2322

2423
<#=this.GetCollectionInterfaceDefinition(prop)#>
@@ -45,31 +44,31 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
4544
/// <returns>The request object to send.</returns>
4645
I<#=collectionRequest#> Expand(string value);
4746

48-
<# } #>
49-
<# if (features.CanSelect) { #>
5047
/// <summary>
5148
/// Adds the specified expand value to the request.
5249
/// </summary>
5350
/// <param name="expandExpression">The expression from which to calculate the expand value.</param>
5451
/// <returns>The request object to send.</returns>
5552
I<#=collectionRequest#> Expand(Expression<Func<<#=innerEntityType#>, object>> expandExpression);
5653

54+
<# } #>
55+
<# if (features.CanSelect) { #>
5756
/// <summary>
5857
/// Adds the specified select value to the request.
5958
/// </summary>
6059
/// <param name="value">The select value.</param>
6160
/// <returns>The request object to send.</returns>
6261
I<#=collectionRequest#> Select(string value);
6362

64-
<# } #>
65-
<# if (features.CanUseTop) { #>
6663
/// <summary>
6764
/// Adds the specified select value to the request.
6865
/// </summary>
6966
/// <param name="selectExpression">The expression from which to calculate the select value.</param>
7067
/// <returns>The request object to send.</returns>
7168
I<#=collectionRequest#> Select(Expression<Func<<#=innerEntityType#>, object>> selectExpression);
7269

70+
<# } #>
71+
<# if (features.CanUseTop) { #>
7372
/// <summary>
7473
/// Adds the specified top value to the request.
7574
/// </summary>

‎Templates/CSharp/Requests/IEntityCollectionWithReferencesRequest.cs.tt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
var prop = host.CurrentType.AsOdcmProperty();
66
var collectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
77
var collectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
8+
var innerEntity = prop.Projection.Type;
9+
var innerEntityType = innerEntity.Name.ToCheckedCase();
810

911
var features = host.CurrentType.GetFeatures();
1012
#>
@@ -15,6 +17,7 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
1517
using System.Collections.Generic;
1618
using System.Net.Http;
1719
using System.Threading;
20+
using System.Linq.Expressions;
1821

1922
<#=this.GetCollectionWithReferencesInterfaceDefinition(prop)#>
2023
{
@@ -39,6 +42,13 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
3942
/// <returns>The request object to send.</returns>
4043
I<#=collectionRequest#> Expand(string value);
4144

45+
/// <summary>
46+
/// Adds the specified expand value to the request.
47+
/// </summary>
48+
/// <param name="expandExpression">The expression from which to calculate the expand value.</param>
49+
/// <returns>The request object to send.</returns>
50+
I<#=collectionRequest#> Expand(Expression<Func<<#=innerEntityType#>, object>> expandExpression);
51+
4252
<# } #>
4353
<# if (features.CanSelect) { #>
4454
/// <summary>
@@ -48,6 +58,13 @@ namespace <#=this.GetNamespaceName(prop.Class.AsOdcmClass())#>
4858
/// <returns>The request object to send.</returns>
4959
I<#=collectionRequest#> Select(string value);
5060

61+
/// <summary>
62+
/// Adds the specified select value to the request.
63+
/// </summary>
64+
/// <param name="selectExpression">The expression from which to calculate the select value.</param>
65+
/// <returns>The request object to send.</returns>
66+
I<#=collectionRequest#> Select(Expression<Func<<#=innerEntityType#>, object>> selectExpression);
67+
5168
<# } #>
5269
<# if (features.CanUseTop) { #>
5370
/// <summary>

‎Templates/CSharp/Requests/IEntityRequest.cs.tt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace <#=this.GetNamespaceName(entity)#>
1515
using System.IO;
1616
using System.Net.Http;
1717
using System.Threading;
18-
using System.Threading.Tasks;
1918
using System.Linq.Expressions;
2019

2120
<#=this.GetEntityRequestInterfaceDefinition(entity)#>

‎Templates/CSharp/Requests/IEntityWithReferenceRequest.cs.tt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace <#=this.GetNamespaceName(entity)#>
1515
using System.IO;
1616
using System.Net.Http;
1717
using System.Threading;
18-
using System.Threading.Tasks;
1918
using System.Linq.Expressions;
2019

2120
<#=this.GetEntityWithReferenceRequestInterfaceDefinition(entity)#>

0 commit comments

Comments
 (0)