Skip to content

Commit 0bc1643

Browse files
committed
Merge branch 'replacing-local-dependency-to-nuget' into New-Demo-2
2 parents c2b6dd3 + e6745be commit 0bc1643

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed
Binary file not shown.

MainDemo.Wpf/MainWindow.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public MainWindow()
2222
InitializeComponent();
2323
XamlDisplayerPanel.Initialize(
2424
source: XamlDisplayerPanel.SourceEnum.LoadFromRemote,
25-
defaultLocalPath:
26-
$@"C:\Users\User\Desktop\MaterialDesignXAMLToolKitNew\MaterialDesignInXamlToolkit\MainDemo.Wpf\",
25+
defaultLocalPath: $@"C:\Users\User\Desktop\MaterialDesignXAMLToolKitNew\MaterialDesignInXamlToolkit\MainDemo.Wpf\",
2726
defaultRemotePath: @"https://raw.githubusercontent.com/wongjiahau/MaterialDesignInXamlToolkit/New-Demo-2/MainDemo.Wpf/" ,
2827
attributesToBeRemoved:
2928
new List<string>()

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<Paket>True</Paket>
6060
<Link>ControlzEx/PopupEx.cs</Link>
6161
</Compile>
62+
<Reference Include="CodeDisplayer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\XamlDisplayerPackage.1.0.0\lib\XamlDisplayer\CodeDisplayer.dll</HintPath>
64+
</Reference>
6265
<Reference Include="System" />
6366
<Reference Include="System.Data" />
6467
<Reference Include="System.Xml" />
@@ -399,6 +402,7 @@
399402
<Generator>ResXFileCodeGenerator</Generator>
400403
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
401404
</EmbeddedResource>
405+
<None Include="packages.config" />
402406
<None Include="paket.references" />
403407
<None Include="Properties\Settings.settings">
404408
<Generator>SettingsSingleFileGenerator</Generator>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="XamlDisplayerPackage" version="1.0.0" targetFramework="net45" />
4+
</packages>

0 commit comments

Comments
 (0)