Skip to content

Commit 7b1e473

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'More-paket-stuff' of https://github.com/punker76/MaterialDesignInXamlToolkit into punker76-More-paket-stuff
2 parents ff1640e + dea4a7a commit 7b1e473

30 files changed

+305
-155
lines changed

‎.paket/paket.bootstrapper.exe

14 KB
Binary file not shown.

‎.paket/paket.exe

1.21 MB
Binary file not shown.

‎.paket/paket.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
1717
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
1818
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19-
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
20-
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
2121
<!-- Commands -->
2222
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
2324
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
2425
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
2526
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
@@ -35,6 +36,6 @@
3536
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
3637
</Target>
3738
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
38-
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
39+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
3940
</Target>
4041
</Project>

‎MahMaterialDragablzMashUp/DialogsViewModel.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private void InputDialog()
4444
DialogCoordinator.Instance.ShowInputAsync(this, "MahApps Dialog", "Using Material Design Themes", metroDialogSettings);
4545
}
4646

47-
private void ProgressDialog()
47+
private async void ProgressDialog()
4848
{
4949
var metroDialogSettings = new MetroDialogSettings
5050
{
@@ -53,12 +53,15 @@ private void ProgressDialog()
5353
SuppressDefaultResources = true
5454
};
5555

56-
DialogCoordinator.Instance.ShowProgressAsync(this, "MahApps Dialog", "Using Material Design Themes (WORK IN PROGRESS)", true, metroDialogSettings);
56+
var controller = await DialogCoordinator.Instance.ShowProgressAsync(this, "MahApps Dialog", "Using Material Design Themes (WORK IN PROGRESS)", true, metroDialogSettings);
57+
controller.SetIndeterminate();
58+
await Task.Delay(3000);
59+
await controller.CloseAsync();
5760
}
5861

5962
private void ShowLeftFlyout()
6063
{
61-
((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen = true;
64+
((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen = !((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen;
6265
}
6366
}
6467
}

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
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-
<RestorePackages>true</RestorePackages>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,20 +49,8 @@
5049
<Prefer32Bit>true</Prefer32Bit>
5150
</PropertyGroup>
5251
<ItemGroup>
53-
<Reference Include="Dragablz, Version=0.0.3.151, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Dragablz.0.0.3.151\lib\net45\Dragablz.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
58-
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
6152
<Reference Include="System" />
6253
<Reference Include="System.Data" />
63-
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
6754
<Reference Include="System.Xml" />
6855
<Reference Include="Microsoft.CSharp" />
6956
<Reference Include="System.Core" />
@@ -144,7 +131,7 @@
144131
<Generator>ResXFileCodeGenerator</Generator>
145132
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
146133
</EmbeddedResource>
147-
<None Include="packages.config" />
134+
<None Include="paket.references" />
148135
<None Include="Properties\Settings.settings">
149136
<Generator>SettingsSingleFileGenerator</Generator>
150137
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -172,18 +159,39 @@
172159
<Resource Include="Resources\ProfilePic.jpg" />
173160
</ItemGroup>
174161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
175-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
176-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
177-
<PropertyGroup>
178-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
179-
</PropertyGroup>
180-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
181-
</Target>
182162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
183163
Other similar extension points exist, see Microsoft.Common.targets.
184164
<Target Name="BeforeBuild">
185165
</Target>
186166
<Target Name="AfterBuild">
187167
</Target>
188168
-->
169+
<Choose>
170+
<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')">
171+
<ItemGroup>
172+
<Reference Include="Dragablz">
173+
<HintPath>..\packages\Dragablz\lib\net45\Dragablz.dll</HintPath>
174+
<Private>True</Private>
175+
<Paket>True</Paket>
176+
</Reference>
177+
</ItemGroup>
178+
</When>
179+
</Choose>
180+
<Choose>
181+
<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')">
182+
<ItemGroup>
183+
<Reference Include="MahApps.Metro">
184+
<HintPath>..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>
185+
<Private>True</Private>
186+
<Paket>True</Paket>
187+
</Reference>
188+
<Reference Include="System.Windows.Interactivity">
189+
<HintPath>..\packages\MahApps.Metro\lib\net45\System.Windows.Interactivity.dll</HintPath>
190+
<Private>True</Private>
191+
<Paket>True</Paket>
192+
</Reference>
193+
</ItemGroup>
194+
</When>
195+
</Choose>
196+
<Import Project="..\.paket\paket.targets" />
189197
</Project>

‎MahMaterialDragablzMashUp/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/paket.references

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MahApps.Metro
2+
Dragablz

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<ApplicationIcon>favicon.ico</ApplicationIcon>
4848
</PropertyGroup>
4949
<ItemGroup>
50+
<Compile Include="..\paket-files\samueldjack\VirtualCollection\VirtualCollection\VirtualCollection\VirtualizingWrapPanel.cs">
51+
<Paket>True</Paket>
52+
<Link>VirtualCollection/VirtualizingWrapPanel.cs</Link>
53+
</Compile>
5054
<Reference Include="PresentationFramework.Aero2" />
5155
<Reference Include="System" />
5256
<Reference Include="System.Data" />
@@ -67,9 +71,6 @@
6771
<Generator>MSBuild:Compile</Generator>
6872
<SubType>Designer</SubType>
6973
</ApplicationDefinition>
70-
<Compile Include="..\paket-files\samueldjack\VirtualCollection\VirtualCollection\VirtualCollection\VirtualizingWrapPanel.cs">
71-
<Link>VirtualCollection\VirtualizingWrapPanel.cs</Link>
72-
</Compile>
7374
<Compile Include="Buttons.xaml.cs">
7475
<DependentUpon>Buttons.xaml</DependentUpon>
7576
</Compile>
@@ -370,6 +371,7 @@
370371
<Generator>ResXFileCodeGenerator</Generator>
371372
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
372373
</EmbeddedResource>
374+
<None Include="paket.references" />
373375
<None Include="Properties\Settings.settings">
374376
<Generator>SettingsSingleFileGenerator</Generator>
375377
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -418,4 +420,5 @@
418420
<Target Name="AfterBuild">
419421
</Target>
420422
-->
423+
<Import Project="..\.paket\paket.targets" />
421424
</Project>

‎MainDemo.Wpf/paket.references

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
File:VirtualizingWrapPanel.cs VirtualCollection

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

Lines changed: 59 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
<AssemblyName>MaterialDesignColors.Wpf.Fixture</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>
15-
</NuGetPackageImportStamp>
1614
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17-
<RestorePackages>true</RestorePackages>
1815
</PropertyGroup>
1916
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2017
<DebugSymbols>true</DebugSymbols>
@@ -34,10 +31,6 @@
3431
<WarningLevel>4</WarningLevel>
3532
</PropertyGroup>
3633
<ItemGroup>
37-
<Reference Include="Shouldly, Version=2.5.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Shouldly.2.5.0\lib\net40\Shouldly.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
4134
<Reference Include="System" />
4235
<Reference Include="System.Core" />
4336
<Reference Include="System.Xml.Linq" />
@@ -46,49 +39,82 @@
4639
<Reference Include="System.Data" />
4740
<Reference Include="System.Net.Http" />
4841
<Reference Include="System.Xml" />
49-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
50-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
54-
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
58-
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
62-
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
6542
</ItemGroup>
6643
<ItemGroup>
6744
<Compile Include="ResourceProviderFixture.cs" />
6845
<Compile Include="Properties\AssemblyInfo.cs" />
6946
</ItemGroup>
70-
<ItemGroup>
71-
<None Include="packages.config" />
72-
</ItemGroup>
7347
<ItemGroup>
7448
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj">
7549
<Project>{90B53209-C60C-4655-B28D-A1B3E1044BA3}</Project>
7650
<Name>MaterialDesignColors.Wpf</Name>
7751
</ProjectReference>
7852
</ItemGroup>
53+
<ItemGroup>
54+
<None Include="paket.references" />
55+
</ItemGroup>
7956
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
80-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
81-
<PropertyGroup>
82-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
83-
</PropertyGroup>
84-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
85-
</Target>
86-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8757
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8858
Other similar extension points exist, see Microsoft.Common.targets.
8959
<Target Name="BeforeBuild">
9060
</Target>
9161
<Target Name="AfterBuild">
9262
</Target>
9363
-->
64+
<Choose>
65+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
66+
<ItemGroup>
67+
<Reference Include="Shouldly">
68+
<HintPath>..\packages\Shouldly\lib\net40\Shouldly.dll</HintPath>
69+
<Private>True</Private>
70+
<Paket>True</Paket>
71+
</Reference>
72+
</ItemGroup>
73+
</When>
74+
</Choose>
75+
<Choose>
76+
<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')">
77+
<ItemGroup>
78+
<Reference Include="xunit.abstractions">
79+
<HintPath>..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll</HintPath>
80+
<Private>True</Private>
81+
<Paket>True</Paket>
82+
</Reference>
83+
</ItemGroup>
84+
</When>
85+
</Choose>
86+
<Choose>
87+
<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')">
88+
<ItemGroup>
89+
<Reference Include="xunit.assert">
90+
<HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
91+
<Private>True</Private>
92+
<Paket>True</Paket>
93+
</Reference>
94+
</ItemGroup>
95+
</When>
96+
</Choose>
97+
<Choose>
98+
<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')">
99+
<ItemGroup>
100+
<Reference Include="xunit.core">
101+
<HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
102+
<Private>True</Private>
103+
<Paket>True</Paket>
104+
</Reference>
105+
</ItemGroup>
106+
</When>
107+
</Choose>
108+
<Choose>
109+
<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')">
110+
<ItemGroup>
111+
<Reference Include="xunit.execution.desktop">
112+
<HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
113+
<Private>True</Private>
114+
<Paket>True</Paket>
115+
</Reference>
116+
</ItemGroup>
117+
</When>
118+
</Choose>
119+
<Import Project="..\.paket\paket.targets" />
94120
</Project>

0 commit comments

Comments
 (0)