Skip to content

Commit cbfc4ca

Browse files
DigitalFlowFlorian Krönert
DigitalFlow
authored and
Florian Krönert
committed
Fixed bug in RetrieveAll: 0 was passed as first page number, which lead to duplicate first page in online organizations. Default to 1 now.
1 parent e6f7580 commit cbfc4ca

4 files changed

Lines changed: 40 additions & 111 deletions

File tree

‎build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ let packagesDir = @".\packages\"
3131
// version info
3232
let mutable majorversion = "2"
3333
let mutable minorversion = "1"
34-
let mutable build = "1"
34+
let mutable patch = "2"
3535
let mutable nugetVersion = ""
3636
let mutable asmVersion = ""
3737
let mutable asmInfoVersion = ""

‎src/lib/Xrm.Oss.FluentQuery/FluentQuery.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,10 @@ private string GenerateQueryCacheKey(QueryExpression query)
308308
}
309309
}
310310

311-
public List<T> ReturnFromCache()
311+
public List<T> ReturnFromCache(string key)
312312
{
313313
if (_cache != null)
314314
{
315-
var key = GenerateQueryCacheKey(_query);
316-
317315
if (_cache.Contains(key))
318316
{
319317
return _cache.Get(key) as List<T>;
@@ -323,19 +321,18 @@ public List<T> ReturnFromCache()
323321
return null;
324322
}
325323

326-
public void SetCacheResult(List<T> result)
324+
public void SetCacheResult(string key, List<T> result)
327325
{
328326
if (_cache != null)
329327
{
330-
var key = GenerateQueryCacheKey(_query);
331-
332328
_cache.Set(key, result, _absoluteExpiration);
333329
}
334330
}
335331

336332
public List<T> Retrieve()
337333
{
338-
var cacheResult = ReturnFromCache();
334+
var cacheKey = _cache != null ? GenerateQueryCacheKey(_query) : null;
335+
var cacheResult = ReturnFromCache(cacheKey);
339336

340337
if (cacheResult != null)
341338
{
@@ -345,14 +342,15 @@ public List<T> Retrieve()
345342
var result = _service.RetrieveMultiple(_query).Entities.Select(e => e.ToEntity<T>())
346343
.ToList();
347344

348-
SetCacheResult(result);
345+
SetCacheResult(cacheKey, result);
349346

350347
return result;
351348
}
352349

353350
public List<T> RetrieveAll()
354351
{
355-
var cacheResult = ReturnFromCache();
352+
var cacheKey = _cache != null ? GenerateQueryCacheKey(_query) : null;
353+
var cacheResult = ReturnFromCache(cacheKey);
356354

357355
if (cacheResult != null)
358356
{
@@ -361,7 +359,8 @@ public List<T> RetrieveAll()
361359

362360
var records = new List<T>();
363361

364-
var previousPageNumber = _query.PageInfo.PageNumber;
362+
// Default to 1 as first page number, otherwise the first page is retrieved twice (once while supplying 0 as page number and again when supplying 1)
363+
var previousPageNumber = _query.PageInfo.PageNumber > 0 ? _query.PageInfo.PageNumber : 1;
365364
var previousPagingCookie = _query.PageInfo.PagingCookie;
366365

367366
var moreRecords = false;
@@ -393,7 +392,7 @@ public List<T> RetrieveAll()
393392
_query.PageInfo.PageNumber = previousPageNumber;
394393
_query.PageInfo.PagingCookie = previousPagingCookie;
395394

396-
SetCacheResult(records);
395+
SetCacheResult(cacheKey, records);
397396

398397
return records;
399398
}

‎src/lib/Xrm.Oss.FluentQuery/Xrm.Oss.FluentQuery.csproj‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Xrm.Oss.FluentQuery</RootNamespace>
1111
<AssemblyName>Xrm.Oss.FluentQuery</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -44,6 +45,11 @@
4445
<Compile Include="FluentQuery.cs" />
4546
<Compile Include="Properties\AssemblyInfo.cs" />
4647
</ItemGroup>
48+
<ItemGroup>
49+
<PackageReference Include="Microsoft.CrmSdk.CoreAssemblies">
50+
<Version>9.0.2.24</Version>
51+
</PackageReference>
52+
</ItemGroup>
4753
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4854
<Choose>
4955
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
@@ -72,28 +78,10 @@
7278
<Reference Include="System.Web">
7379
<Paket>True</Paket>
7480
</Reference>
75-
<Reference Include="Microsoft.Crm.Sdk.Proxy">
76-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
77-
<Private>True</Private>
78-
<Paket>True</Paket>
79-
</Reference>
80-
<Reference Include="Microsoft.Xrm.Sdk">
81-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net452\Microsoft.Xrm.Sdk.dll</HintPath>
82-
<Private>True</Private>
83-
<Paket>True</Paket>
84-
</Reference>
8581
</ItemGroup>
8682
</When>
8783
</Choose>
8884
<Choose>
89-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
90-
<ItemGroup>
91-
<Reference Include="Microsoft.IdentityModel">
92-
<HintPath>..\..\..\packages\Microsoft.IdentityModel\lib\net35\Microsoft.IdentityModel.dll</HintPath>
93-
<Private>True</Private>
94-
<Paket>True</Paket>
95-
</Reference>
96-
</ItemGroup>
97-
</When>
85+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
9886
</Choose>
9987
</Project>

‎src/test/Xrm.Oss.FluentQuery.Tests/Xrm.Oss.FluentQuery.Tests.csproj‎

Lines changed: 21 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Xrm.Oss.FluentQuery.Tests</RootNamespace>
1212
<AssemblyName>Xrm.Oss.FluentQuery.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -50,15 +51,26 @@
5051
<Compile Include="FluentQueryTests.cs" />
5152
<Compile Include="Properties\AssemblyInfo.cs" />
5253
</ItemGroup>
54+
<ItemGroup>
55+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<PackageReference Include="FakeXrmEasy.9">
59+
<Version>1.57.0</Version>
60+
</PackageReference>
61+
<PackageReference Include="NUnit">
62+
<Version>3.12.0</Version>
63+
</PackageReference>
64+
<PackageReference Include="NUnit3TestAdapter">
65+
<Version>3.17.0-beta.1</Version>
66+
</PackageReference>
67+
</ItemGroup>
5368
<ItemGroup>
5469
<ProjectReference Include="..\..\lib\Xrm.Oss.FluentQuery\Xrm.Oss.FluentQuery.csproj">
5570
<Project>{4058fa56-2332-44a5-aed4-da20526434ac}</Project>
5671
<Name>Xrm.Oss.FluentQuery</Name>
5772
</ProjectReference>
5873
</ItemGroup>
59-
<ItemGroup>
60-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
61-
</ItemGroup>
6274
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6375
<Choose>
6476
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
@@ -90,15 +102,7 @@
90102
</Reference>
91103
</ItemGroup>
92104
</When>
93-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
94-
<ItemGroup>
95-
<Reference Include="FakeItEasy">
96-
<HintPath>..\..\..\packages\FakeItEasy\lib\net40\FakeItEasy.dll</HintPath>
97-
<Private>True</Private>
98-
<Paket>True</Paket>
99-
</Reference>
100-
</ItemGroup>
101-
</When>
105+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
102106
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0'">
103107
<ItemGroup>
104108
<Reference Include="FakeItEasy">
@@ -127,11 +131,6 @@
127131
<Reference Include="System.Runtime.Serialization">
128132
<Paket>True</Paket>
129133
</Reference>
130-
<Reference Include="FakeXrmEasy">
131-
<HintPath>..\..\..\packages\FakeXrmEasy.365\lib\net452\FakeXrmEasy.dll</HintPath>
132-
<Private>True</Private>
133-
<Paket>True</Paket>
134-
</Reference>
135134
</ItemGroup>
136135
</When>
137136
</Choose>
@@ -159,16 +158,6 @@
159158
<Reference Include="System.Web">
160159
<Paket>True</Paket>
161160
</Reference>
162-
<Reference Include="Microsoft.Crm.Sdk.Proxy">
163-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
164-
<Private>True</Private>
165-
<Paket>True</Paket>
166-
</Reference>
167-
<Reference Include="Microsoft.Xrm.Sdk">
168-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net452\Microsoft.Xrm.Sdk.dll</HintPath>
169-
<Private>True</Private>
170-
<Paket>True</Paket>
171-
</Reference>
172161
</ItemGroup>
173162
</When>
174163
</Choose>
@@ -178,11 +167,6 @@
178167
<Reference Include="System.Web.Services">
179168
<Paket>True</Paket>
180169
</Reference>
181-
<Reference Include="Microsoft.Xrm.Sdk.Deployment">
182-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.Deployment\lib\net452\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
183-
<Private>True</Private>
184-
<Paket>True</Paket>
185-
</Reference>
186170
</ItemGroup>
187171
</When>
188172
</Choose>
@@ -204,24 +188,11 @@
204188
<Reference Include="System.Workflow.Runtime">
205189
<Paket>True</Paket>
206190
</Reference>
207-
<Reference Include="Microsoft.Xrm.Sdk.Workflow">
208-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.Workflow\lib\net452\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
209-
<Private>True</Private>
210-
<Paket>True</Paket>
211-
</Reference>
212191
</ItemGroup>
213192
</When>
214193
</Choose>
215194
<Choose>
216-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
217-
<ItemGroup>
218-
<Reference Include="Microsoft.Xrm.Tooling.Connector">
219-
<HintPath>..\..\..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly\lib\net452\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
220-
<Private>True</Private>
221-
<Paket>True</Paket>
222-
</Reference>
223-
</ItemGroup>
224-
</When>
195+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
225196
</Choose>
226197
<Choose>
227198
<When Condition="$(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')">
@@ -235,31 +206,10 @@
235206
</When>
236207
</Choose>
237208
<Choose>
238-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
239-
<ItemGroup>
240-
<Reference Include="Microsoft.IdentityModel">
241-
<HintPath>..\..\..\packages\Microsoft.IdentityModel\lib\net35\Microsoft.IdentityModel.dll</HintPath>
242-
<Private>True</Private>
243-
<Paket>True</Paket>
244-
</Reference>
245-
</ItemGroup>
246-
</When>
209+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
247210
</Choose>
248211
<Choose>
249-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
250-
<ItemGroup>
251-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
252-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
253-
<Private>True</Private>
254-
<Paket>True</Paket>
255-
</Reference>
256-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform">
257-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
258-
<Private>True</Private>
259-
<Paket>True</Paket>
260-
</Reference>
261-
</ItemGroup>
262-
</When>
212+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
263213
</Choose>
264214
<Choose>
265215
<When Condition="($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6')">
@@ -343,15 +293,7 @@
343293
</Reference>
344294
</ItemGroup>
345295
</When>
346-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
347-
<ItemGroup>
348-
<Reference Include="nunit.framework">
349-
<HintPath>..\..\..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
350-
<Private>True</Private>
351-
<Paket>True</Paket>
352-
</Reference>
353-
</ItemGroup>
354-
</When>
296+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')" />
355297
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkIdentifier) == 'Xamarin.tvOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.watchOS')">
356298
<ItemGroup>
357299
<Reference Include="nunit.framework">

0 commit comments

Comments
 (0)