Skip to content

Commit 2726129

Browse files
author
Declan Taylor
committed
Updates reference to Infrastructure project in dependant projects
1 parent 52843cb commit 2726129

File tree

10 files changed

+84
-36
lines changed

10 files changed

+84
-36
lines changed

‎source/Demos/SuggestBoxDemo/GenericSuggestBoxDemo.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
</ItemGroup>
100100
<ItemGroup />
101101
<ItemGroup>
102+
<ProjectReference Include="..\..\Infrastructure\Infrastructure.csproj">
103+
<Project>{807dc828-11db-4151-8bbd-f48516c1ba44}</Project>
104+
<Name>Infrastructure</Name>
105+
</ProjectReference>
102106
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
103107
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
104108
<Name>SuggestBoxLib</Name>

‎source/Demos/SuggestBoxTestLib/DataSources/Auto/AutoSuggestSource.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
namespace SuggestBoxTestLib.DataSources.Auto
1+
using Infrastructure;
2+
3+
namespace SuggestBoxTestLib.DataSources.Auto
24
{
35
using SuggestBoxTestLib.AutoSuggest;
46
using SuggestBoxTestLib.DataSources.Auto.Interfaces;
57
using SuggestBoxTestLib.DataSources.Directory;
68
using SuggestBoxTestLib.ViewModels;
7-
using SuggestBoxTestLib.ViewModels.Base;
89
using System;
910
using System.Collections.Generic;
1011
using System.Linq;

‎source/Demos/SuggestBoxTestLib/DataSources/Directory/DirectorySuggestSource.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
namespace SuggestBoxTestLib.DataSources
1+
 using Infrastructure;
2+
3+
namespace SuggestBoxTestLib.DataSources
24
{
35
using SuggestBoxTestLib.DataSources.Directory;
46
using SuggestBoxTestLib.ViewModels;
5-
using SuggestBoxTestLib.ViewModels.Base;
67
using System;
78
using System.Collections.Generic;
89
using System.IO;

‎source/Demos/SuggestBoxTestLib/DataSources/Dummy/DummySuggestions.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
namespace SuggestBoxTestLib.DataSources.Directory
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading;
5+
using System.Threading.Tasks;
6+
using System.Windows.Input;
7+
using Infrastructure;
8+
using SuggestBoxTestLib.DataSources.Directory;
9+
using SuggestBoxTestLib.ViewModels;
10+
11+
namespace SuggestBoxTestLib.DataSources.Dummy
212
{
3-
using SuggestBoxTestLib.ViewModels;
4-
using SuggestBoxTestLib.ViewModels.Base;
5-
using System;
6-
using System.Collections.Generic;
7-
using System.Linq;
8-
using System.Threading;
9-
using System.Threading.Tasks;
10-
using System.Windows.Input;
11-
12-
/// <summary>
13+
/// <summary>
1314
/// Defines a suggestion object to generate suggestions
1415
/// based on sub entries of specified string.
1516
/// </summary>

‎source/Demos/SuggestBoxTestLib/SuggestBoxTestLib.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
<Compile Include="DataSources\Dummy\DummySuggestions.cs" />
5454
<Compile Include="Properties\AssemblyInfo.cs" />
5555
<Compile Include="ViewModels\AppViewModel.cs" />
56-
<Compile Include="ViewModels\Base\RelayCommand.cs" />
57-
<Compile Include="ViewModels\Base\ViewModelBase.cs" />
5856
<Compile Include="DataSources\Directory\DirectorySuggestSource.cs" />
5957
<Compile Include="ViewModels\DummySuggestSource.cs" />
6058
<Compile Include="ViewModels\FakeViewModel.cs" />
@@ -70,6 +68,10 @@
7068
</Page>
7169
</ItemGroup>
7270
<ItemGroup>
71+
<ProjectReference Include="..\..\Infrastructure\Infrastructure.csproj">
72+
<Project>{807dc828-11db-4151-8bbd-f48516c1ba44}</Project>
73+
<Name>Infrastructure</Name>
74+
</ProjectReference>
7375
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
7476
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
7577
<Name>SuggestBoxLib</Name>

‎source/Demos/SuggestBoxTestLib/ViewModels/AppViewModel.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
namespace SuggestBoxTestLib.ViewModels
1+
using Infrastructure;
2+
using SuggestBoxTestLib.DataSources.Dummy;
3+
4+
namespace SuggestBoxTestLib.ViewModels
25
{
36
using SuggestBoxTestLib.AutoSuggest;
47
using SuggestBoxTestLib.DataSources;
@@ -11,7 +14,7 @@
1114
using System.Threading.Tasks;
1215
using System.Windows.Data;
1316

14-
public class AppViewModel : Base.ViewModelBase
17+
public class AppViewModel : ViewModelBase
1518
{
1619
private readonly ObservableCollection<string> _RecentLocationItems;
1720
private readonly object _RecentLocationItemsItemsLock;

‎source/Demos/SuggestBoxTestLib/ViewModels/FakeViewModel.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace SuggestBoxTestLib.ViewModels
1+
using Infrastructure;
2+
3+
namespace SuggestBoxTestLib.ViewModels
24
{
35
using System;
46
using System.Collections.ObjectModel;
@@ -8,7 +10,7 @@
810
/// Implements a tree like viewmodel to demonstrate usage of the suggestion
911
/// boxes with "Sub" string entries.
1012
/// </summary>
11-
public class FakeViewModel : Base.ViewModelBase
13+
public class FakeViewModel : ViewModelBase
1214
{
1315
#region Fields
1416

‎source/Demos/SuggestBoxTestLib/Views/DemoView.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace SuggestBoxTestLib.Views
22
{
33
using SuggestBoxLib.Events;
4-
using SuggestBoxTestLib.ViewModels.Base;
4+
using Infrastructure;
55
using System.Windows;
66
using System.Windows.Controls;
77
using System.Windows.Input;

‎source/Demos/ThemedSuggestBoxDemo/ThemedSuggestBoxDemo.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@
145145
<Project>{2807b493-cc2e-402e-901a-eb138698fedc}</Project>
146146
<Name>Settings</Name>
147147
</ProjectReference>
148+
<ProjectReference Include="..\..\Infrastructure\Infrastructure.csproj">
149+
<Project>{807dc828-11db-4151-8bbd-f48516c1ba44}</Project>
150+
<Name>Infrastructure</Name>
151+
</ProjectReference>
148152
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
149153
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
150154
<Name>SuggestBoxLib</Name>

‎source/SuggestBoxLib.sln‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuggestBoxTestLib", "Demos\
2222
EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuggestBoxLib", "SuggestBoxLib\SuggestBoxLib.csproj", "{F6D38418-CD9A-4F26-BC8B-12C9BD74A672}"
2424
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CachedPathSuggestBoxDemo", "Demos\CachedPathSuggestBoxDemo\CachedPathSuggestBoxDemo.csproj", "{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure", "Infrastructure\Infrastructure.csproj", "{807DC828-11DB-4151-8BBD-F48516C1BA44}"
26+
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CachedPathSuggest", "Demos\CachedPathSuggest\CachedPathSuggest.csproj", "{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}"
28+
EndProject
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CachedPathSuggestBox.Demo", "Demos\CachedPathSuggestBox.Demo\CachedPathSuggestBox.Demo.csproj", "{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}"
2630
EndProject
2731
Global
2832
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -118,18 +122,42 @@ Global
118122
{F6D38418-CD9A-4F26-BC8B-12C9BD74A672}.Release|x64.Build.0 = Release|Any CPU
119123
{F6D38418-CD9A-4F26-BC8B-12C9BD74A672}.Release|x86.ActiveCfg = Release|Any CPU
120124
{F6D38418-CD9A-4F26-BC8B-12C9BD74A672}.Release|x86.Build.0 = Release|Any CPU
121-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|Any CPU.Build.0 = Debug|Any CPU
123-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|x64.ActiveCfg = Debug|Any CPU
124-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|x64.Build.0 = Debug|Any CPU
125-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|x86.ActiveCfg = Debug|Any CPU
126-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Debug|x86.Build.0 = Debug|Any CPU
127-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|Any CPU.ActiveCfg = Release|Any CPU
128-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|Any CPU.Build.0 = Release|Any CPU
129-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|x64.ActiveCfg = Release|Any CPU
130-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|x64.Build.0 = Release|Any CPU
131-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|x86.ActiveCfg = Release|Any CPU
132-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A}.Release|x86.Build.0 = Release|Any CPU
125+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|Any CPU.Build.0 = Debug|Any CPU
127+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|x64.ActiveCfg = Debug|Any CPU
128+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|x64.Build.0 = Debug|Any CPU
129+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|x86.ActiveCfg = Debug|Any CPU
130+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Debug|x86.Build.0 = Debug|Any CPU
131+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
132+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|Any CPU.Build.0 = Release|Any CPU
133+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|x64.ActiveCfg = Release|Any CPU
134+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|x64.Build.0 = Release|Any CPU
135+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|x86.ActiveCfg = Release|Any CPU
136+
{807DC828-11DB-4151-8BBD-F48516C1BA44}.Release|x86.Build.0 = Release|Any CPU
137+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
139+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|x64.ActiveCfg = Debug|Any CPU
140+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|x64.Build.0 = Debug|Any CPU
141+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|x86.ActiveCfg = Debug|Any CPU
142+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Debug|x86.Build.0 = Debug|Any CPU
143+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|Any CPU.Build.0 = Release|Any CPU
145+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|x64.ActiveCfg = Release|Any CPU
146+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|x64.Build.0 = Release|Any CPU
147+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|x86.ActiveCfg = Release|Any CPU
148+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8}.Release|x86.Build.0 = Release|Any CPU
149+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|x64.ActiveCfg = Debug|Any CPU
152+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|x64.Build.0 = Debug|Any CPU
153+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|x86.ActiveCfg = Debug|Any CPU
154+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Debug|x86.Build.0 = Debug|Any CPU
155+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
156+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|Any CPU.Build.0 = Release|Any CPU
157+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|x64.ActiveCfg = Release|Any CPU
158+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|x64.Build.0 = Release|Any CPU
159+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|x86.ActiveCfg = Release|Any CPU
160+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB}.Release|x86.Build.0 = Release|Any CPU
133161
EndGlobalSection
134162
GlobalSection(SolutionProperties) = preSolution
135163
HideSolutionNode = FALSE
@@ -142,7 +170,9 @@ Global
142170
{2807B493-CC2E-402E-901A-EB138698FEDC} = {E3145A5C-462B-4503-8554-89F7E6DD1457}
143171
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77} = {E3145A5C-462B-4503-8554-89F7E6DD1457}
144172
{F6A08289-52E8-45CD-928B-E71D7BCB6290} = {59C7A10F-2DE5-46AC-BCC1-94FD094AE591}
145-
{AF99EB99-8B82-425D-AD77-E9CAFDD9814A} = {59C7A10F-2DE5-46AC-BCC1-94FD094AE591}
173+
{807DC828-11DB-4151-8BBD-F48516C1BA44} = {59C7A10F-2DE5-46AC-BCC1-94FD094AE591}
174+
{4D75CB5B-65E2-4EAB-9609-B4A74904E8C8} = {59C7A10F-2DE5-46AC-BCC1-94FD094AE591}
175+
{2B837698-3DAC-48A9-B938-00EFFDC1A3DB} = {59C7A10F-2DE5-46AC-BCC1-94FD094AE591}
146176
EndGlobalSection
147177
GlobalSection(ExtensibilityGlobals) = postSolution
148178
SolutionGuid = {D13A6A7F-1932-4C89-ACDE-BBAEA01D8956}

0 commit comments

Comments
 (0)