Skip to content

Commit 19cfd5d

Browse files
punker76punker76
committed
paket update
1 parent 0d36d20 commit 19cfd5d

File tree

6 files changed

+49
-30
lines changed

6 files changed

+49
-30
lines changed

‎.paket/Paket.Restore.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
7272
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
7373
</PropertyGroup>
74-
74+
7575
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
7676
<PaketRestoreRequired>true</PaketRestoreRequired>
7777
</PropertyGroup>
@@ -96,7 +96,7 @@
9696
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
9797
<!-- paket.references -->
9898
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
99-
99+
100100
<DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
101101
<DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
102102
<PaketRestoreRequired>true</PaketRestoreRequired>

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<PlatformTarget>AnyCPU</PlatformTarget>

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
16+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<PlatformTarget>AnyCPU</PlatformTarget>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@
5555
<None Include="paket.references" />
5656
</ItemGroup>
5757
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58+
<Choose>
59+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
60+
<PropertyGroup>
61+
<__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio</__paket__xunit_runner_visualstudio_props>
62+
</PropertyGroup>
63+
</When>
64+
</Choose>
65+
<Import Project="..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props" Condition="Exists('..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props')" Label="Paket" />
5866
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5967
Other similar extension points exist, see Microsoft.Common.targets.
6068
<Target Name="BeforeBuild">
@@ -84,7 +92,7 @@
8492
</When>
8593
</Choose>
8694
<Choose>
87-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
95+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
8896
<ItemGroup>
8997
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
9098
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>

‎paket-files/paket.restore.cached

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,50 @@ RESTRICTION: || (== net45) (== net452)
22
NUGET
33
remote: https://www.nuget.org/api/v2
44
AvalonEdit (5.0.4)
5-
Castle.Core (4.2.1)
6-
Dragablz (0.0.3.197)
7-
MahApps.Metro (1.5)
8-
Microsoft.NETCore.Platforms (2.0.1) - restriction: == net45
9-
Moq (4.7.145)
10-
Castle.Core (>= 4.2.1)
11-
NETStandard.Library (2.0.1) - restriction: == net45
5+
Castle.Core (4.3.1)
6+
ControlzEx (3.0.2.4)
7+
Dragablz (0.0.3.203)
8+
MahApps.Metro (1.6.5)
9+
ControlzEx (>= 3.0.2.4 < 4.0)
10+
Microsoft.NETCore.Platforms (2.1) - restriction: == net45
11+
Moq (4.9)
12+
Castle.Core (>= 4.3.1)
13+
System.Threading.Tasks.Extensions (>= 4.3)
14+
System.ValueTuple (>= 4.4)
15+
NETStandard.Library (2.0.3) - restriction: == net45
1216
Microsoft.NETCore.Platforms (>= 1.1)
1317
System.Runtime.InteropServices.RuntimeInformation (>= 4.3)
1418
NSubstitute (2.0.3)
1519
RhinoMocks (3.6.1)
1620
Shouldly (2.8.3)
17-
ShowMeTheXAML (1.0.8)
18-
ShowMeTheXAML.AvalonEdit (1.0.8)
21+
ShowMeTheXAML.AvalonEdit (1.0.10)
1922
AvalonEdit (>= 5.0.4 < 5.1)
20-
ShowMeTheXAML (>= 1.0.8 < 1.2)
21-
ShowMeTheXAML.MSBuild (1.0.8)
22-
ShowMeTheXAML (>= 1.0.8 < 1.2)
23+
ShowMeTheXAML (>= 1.0.10 < 1.1)
24+
ShowMeTheXAML.MSBuild (1.0.10)
25+
ShowMeTheXAML (>= 1.0.10 < 1.1)
26+
System.Runtime.CompilerServices.Unsafe (4.5.1)
2327
System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: == net45
24-
xunit (2.3.1)
25-
xunit.analyzers (>= 0.7)
26-
xunit.assert (2.3.1)
27-
xunit.core (2.3.1)
28-
xunit.abstractions (2.0.1)
29-
xunit.analyzers (0.8)
30-
xunit.assert (2.3.1)
28+
System.Threading.Tasks.Extensions (4.5.1)
29+
System.Runtime.CompilerServices.Unsafe (>= 4.5)
30+
System.ValueTuple (4.5)
31+
xunit (2.4)
32+
xunit.analyzers (>= 0.10)
33+
xunit.assert (2.4)
34+
xunit.core (2.4)
35+
xunit.abstractions (2.0.2)
36+
xunit.analyzers (0.10)
37+
xunit.assert (2.4)
3138
NETStandard.Library (>= 1.6.1) - restriction: == net45
32-
xunit.core (2.3.1)
33-
xunit.extensibility.core (2.3.1)
34-
xunit.extensibility.execution (2.3.1)
35-
xunit.extensibility.core (2.3.1)
39+
xunit.core (2.4)
40+
xunit.extensibility.core (2.4)
41+
xunit.extensibility.execution (2.4)
42+
xunit.extensibility.core (2.4)
3643
NETStandard.Library (>= 1.6.1) - restriction: == net45
37-
xunit.abstractions (>= 2.0.1)
38-
xunit.extensibility.execution (2.3.1)
44+
xunit.abstractions (>= 2.0.2)
45+
xunit.extensibility.execution (2.4)
3946
NETStandard.Library (>= 1.6.1) - restriction: == net45
40-
xunit.extensibility.core (2.3.1)
47+
xunit.extensibility.core (2.4)
48+
xunit.runner.visualstudio (2.4)
4149
GITHUB
4250
remote: ControlzEx/ControlzEx
4351
src/ControlzEx/BadgedEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)

‎paket.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ NUGET
77
Dragablz (0.0.3.203)
88
MahApps.Metro (1.6.5)
99
ControlzEx (>= 3.0.2.4 < 4.0)
10-
Microsoft.NETCore.Platforms (2.1) - restriction: == net45
10+
Microsoft.NETCore.Platforms (2.1.1) - restriction: == net45
1111
Moq (4.9)
1212
Castle.Core (>= 4.3.1)
1313
System.Threading.Tasks.Extensions (>= 4.3)
@@ -18,6 +18,7 @@ NUGET
1818
NSubstitute (2.0.3)
1919
RhinoMocks (3.6.1)
2020
Shouldly (2.8.3)
21+
ShowMeTheXAML (1.0.10)
2122
ShowMeTheXAML.AvalonEdit (1.0.10)
2223
AvalonEdit (>= 5.0.4 < 5.1)
2324
ShowMeTheXAML (>= 1.0.10 < 1.1)

0 commit comments

Comments
 (0)