Skip to content

Commit bf41092

Browse files
wongjiahauwongjiahau
authored
Merge pull request #5 from punker76/New-Demo-2
Update paket dependencies
2 parents 64dc4a2 + 589b6f7 commit bf41092

File tree

7 files changed

+105
-52
lines changed

7 files changed

+105
-52
lines changed

‎MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
-->
6464
<Import Project="..\.paket\paket.targets" />
6565
<Choose>
66-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
66+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
6767
<ItemGroup>
6868
<Reference Include="Shouldly">
6969
<HintPath>..\packages\Shouldly\lib\net40\Shouldly.dll</HintPath>
@@ -72,6 +72,26 @@
7272
</Reference>
7373
</ItemGroup>
7474
</When>
75+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
76+
<ItemGroup>
77+
<Reference Include="Shouldly">
78+
<HintPath>..\packages\Shouldly\lib\net451\Shouldly.dll</HintPath>
79+
<Private>True</Private>
80+
<Paket>True</Paket>
81+
</Reference>
82+
</ItemGroup>
83+
</When>
84+
</Choose>
85+
<Choose>
86+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
87+
<ItemGroup>
88+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
89+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
90+
<Private>True</Private>
91+
<Paket>True</Paket>
92+
</Reference>
93+
</ItemGroup>
94+
</When>
7595
</Choose>
7696
<Choose>
7797
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
@@ -88,7 +108,7 @@
88108
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
89109
<ItemGroup>
90110
<Reference Include="xunit.assert">
91-
<HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
111+
<HintPath>..\packages\xunit.assert\lib\netstandard1.1\xunit.assert.dll</HintPath>
92112
<Private>True</Private>
93113
<Paket>True</Paket>
94114
</Reference>
@@ -99,22 +119,32 @@
99119
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
100120
<ItemGroup>
101121
<Reference Include="xunit.core">
102-
<HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
122+
<HintPath>..\packages\xunit.extensibility.core\lib\netstandard1.1\xunit.core.dll</HintPath>
103123
<Private>True</Private>
104124
<Paket>True</Paket>
105125
</Reference>
106126
</ItemGroup>
107127
</When>
108128
</Choose>
109129
<Choose>
110-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
130+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
111131
<ItemGroup>
112132
<Reference Include="xunit.execution.desktop">
113-
<HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
133+
<HintPath>..\packages\xunit.extensibility.execution\lib\net452\xunit.execution.desktop.dll</HintPath>
134+
<Private>True</Private>
135+
<Paket>True</Paket>
136+
</Reference>
137+
</ItemGroup>
138+
</When>
139+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
140+
<ItemGroup>
141+
<Reference Include="xunit.execution.dotnet">
142+
<HintPath>..\packages\xunit.extensibility.execution\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
114143
<Private>True</Private>
115144
<Paket>True</Paket>
116145
</Reference>
117146
</ItemGroup>
118147
</When>
119148
</Choose>
149+
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
120150
</Project>

‎MaterialDesignColors.Wpf.Tests/paket.references

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
Shouldly
2-
xunit
3-
xunit.abstractions
4-
xunit.assert
5-
xunit.core
6-
xunit.extensibility.core
7-
xunit.extensibility.execution
2+
xunit

‎MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</When>
107107
</Choose>
108108
<Choose>
109-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
109+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
110110
<ItemGroup>
111111
<Reference Include="Shouldly">
112112
<HintPath>..\packages\Shouldly\lib\net40\Shouldly.dll</HintPath>
@@ -115,6 +115,26 @@
115115
</Reference>
116116
</ItemGroup>
117117
</When>
118+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
119+
<ItemGroup>
120+
<Reference Include="Shouldly">
121+
<HintPath>..\packages\Shouldly\lib\net451\Shouldly.dll</HintPath>
122+
<Private>True</Private>
123+
<Paket>True</Paket>
124+
</Reference>
125+
</ItemGroup>
126+
</When>
127+
</Choose>
128+
<Choose>
129+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
130+
<ItemGroup>
131+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
132+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
133+
<Private>True</Private>
134+
<Paket>True</Paket>
135+
</Reference>
136+
</ItemGroup>
137+
</When>
118138
</Choose>
119139
<Choose>
120140
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
@@ -131,7 +151,7 @@
131151
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
132152
<ItemGroup>
133153
<Reference Include="xunit.assert">
134-
<HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
154+
<HintPath>..\packages\xunit.assert\lib\netstandard1.1\xunit.assert.dll</HintPath>
135155
<Private>True</Private>
136156
<Paket>True</Paket>
137157
</Reference>
@@ -142,22 +162,32 @@
142162
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
143163
<ItemGroup>
144164
<Reference Include="xunit.core">
145-
<HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
165+
<HintPath>..\packages\xunit.extensibility.core\lib\netstandard1.1\xunit.core.dll</HintPath>
146166
<Private>True</Private>
147167
<Paket>True</Paket>
148168
</Reference>
149169
</ItemGroup>
150170
</When>
151171
</Choose>
152172
<Choose>
153-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
173+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
154174
<ItemGroup>
155175
<Reference Include="xunit.execution.desktop">
156-
<HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
176+
<HintPath>..\packages\xunit.extensibility.execution\lib\net452\xunit.execution.desktop.dll</HintPath>
177+
<Private>True</Private>
178+
<Paket>True</Paket>
179+
</Reference>
180+
</ItemGroup>
181+
</When>
182+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
183+
<ItemGroup>
184+
<Reference Include="xunit.execution.dotnet">
185+
<HintPath>..\packages\xunit.extensibility.execution\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
157186
<Private>True</Private>
158187
<Paket>True</Paket>
159188
</Reference>
160189
</ItemGroup>
161190
</When>
162191
</Choose>
192+
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
163193
</Project>

‎MaterialDesignThemes.Wpf.Tests/paket.references

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@ Moq
22
NSubstitute
33
RhinoMocks
44
Shouldly
5-
xunit
6-
xunit.abstractions
7-
xunit.assert
8-
xunit.core
9-
xunit.extensibility.core
10-
xunit.extensibility.execution
5+
xunit

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
environment:
1616
RestorePackages: false
1717
before_build:
18-
- ps: .paket\paket.exe install
18+
- ps: .paket\paket.exe restore
1919
build:
2020
project: MaterialDesignToolkit.Wpf.sln
2121
verbosity: minimal
@@ -48,7 +48,7 @@
4848
environment:
4949
RestorePackages: false
5050
before_build:
51-
- ps: .paket\paket.exe install
51+
- ps: .paket\paket.exe restore
5252
build:
5353
project: MaterialDesignToolkit.Wpf.sln
5454
verbosity: minimal

‎paket.dependencies

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@ source https://nuget.org/api/v2
22
framework: auto-detect
33

44
nuget MahApps.Metro
5-
nuget Dragablz 0.0.3.165
6-
nuget Moq 4.7.1
7-
nuget NSubstitute 1.10.0
5+
nuget Dragablz ~> 0.0.3
6+
nuget Moq ~> 4.7
7+
nuget NSubstitute ~> 2.0
88
nuget RhinoMocks 3.6.1
9-
nuget Shouldly 2.8.0
10-
nuget XamlDisplayerPackage
11-
nuget xunit 2.1.0
12-
nuget xunit.abstractions 2.0.0
13-
nuget xunit.assert 2.1.0
14-
nuget xunit.core 2.1.0
15-
nuget xunit.extensibility.core 2.1.0
16-
nuget xunit.extensibility.execution 2.1.0
9+
nuget Shouldly ~> 2.8
10+
nuget XamlDisplayerPackage 1.0.1
11+
nuget xunit ~> 2.2
1712

1813
github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/PopupEx.cs
1914
github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/PackIconBase.cs

‎paket.lock

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,34 @@ RESTRICTION: || (== net45) (== net452)
22
NUGET
33
remote: https://www.nuget.org/api/v2
44
Castle.Core (4.1.1)
5-
Dragablz (0.0.3.165)
5+
Dragablz (0.0.3.197)
66
MahApps.Metro (1.5)
7-
Moq (4.7.1)
8-
Castle.Core (>= 4.0)
9-
NSubstitute (1.10)
7+
Microsoft.NETCore.Platforms (2.0) - restriction: || (== net45) (&& (== net45) (== net452))
8+
Moq (4.7.99)
9+
Castle.Core (>= 4.1.1)
10+
NETStandard.Library (2.0) - restriction: == net45
11+
Microsoft.NETCore.Platforms (>= 1.1)
12+
System.Runtime.InteropServices.RuntimeInformation (>= 4.3)
13+
NSubstitute (2.0.3)
1014
RhinoMocks (3.6.1)
11-
Shouldly (2.8)
15+
Shouldly (2.8.3)
16+
System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (== net45) (&& (== net45) (== net452))
1217
XamlDisplayerPackage (1.0.1)
13-
xunit (2.1)
14-
xunit.assert (2.1)
15-
xunit.core (2.1)
16-
xunit.abstractions (2.0)
17-
xunit.assert (2.1)
18-
xunit.core (2.1)
19-
xunit.extensibility.core (2.1)
20-
xunit.extensibility.execution (2.1)
21-
xunit.extensibility.core (2.1)
22-
xunit.abstractions (2.0)
23-
xunit.extensibility.execution (2.1)
24-
xunit.extensibility.core (2.1)
18+
xunit (2.2)
19+
xunit.assert (2.2)
20+
xunit.core (2.2)
21+
xunit.abstractions (2.0.1)
22+
xunit.assert (2.2)
23+
NETStandard.Library (>= 1.6) - restriction: == net45
24+
xunit.core (2.2)
25+
xunit.extensibility.core (2.2)
26+
xunit.extensibility.execution (2.2)
27+
xunit.extensibility.core (2.2)
28+
NETStandard.Library (>= 1.6) - restriction: == net45
29+
xunit.abstractions (>= 2.0.1)
30+
xunit.extensibility.execution (2.2)
31+
NETStandard.Library (>= 1.6) - restriction: == net45
32+
xunit.extensibility.core (2.2)
2533
GITHUB
2634
remote: ControlzEx/ControlzEx
2735
src/ControlzEx/BadgedEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)

0 commit comments

Comments
 (0)