Skip to content

Commit e4ef20e

Browse files
author
ckulesa
committed
Restructured folders under src directory.
1 parent 468ce46 commit e4ef20e

File tree

406 files changed

+37
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+37
-37
lines changed

Diff for: OptiKey.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JuliusSweetland.OptiKey", "src\JuliusSweetland.OptiKey.csproj", "{6865C5AF-C6F0-4BDA-BA1C-7AE8BC225234}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JuliusSweetland.OptiKey", "src\JuliusSweetland.OptiKey\JuliusSweetland.OptiKey.csproj", "{6865C5AF-C6F0-4BDA-BA1C-7AE8BC225234}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{117E0D45-AA2F-4A2B-AAD5-C3101E1CBCA8}"
99
ProjectSection(SolutionItems) = preProject
@@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7AD7A9
2424
.nuget\NuGet.targets = .nuget\NuGet.targets
2525
EndProjectSection
2626
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JuliusSweetland.OptiKey.UnitTests", "JuliusSweetland.OptiKey.UnitTests\JuliusSweetland.OptiKey.UnitTests.csproj", "{345EB82F-7EF0-4118-A1F1-92DA1AEE5197}"
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JuliusSweetland.OptiKey.UnitTests", "src\JuliusSweetland.OptiKey.UnitTests\JuliusSweetland.OptiKey.UnitTests.csproj", "{345EB82F-7EF0-4118-A1F1-92DA1AEE5197}"
2828
EndProject
2929
Global
3030
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: JuliusSweetland.OptiKey.UnitTests/JuliusSweetland.OptiKey.UnitTests.csproj renamed to src/JuliusSweetland.OptiKey.UnitTests/JuliusSweetland.OptiKey.UnitTests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
35+
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
39+
<HintPath>..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
43-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
43+
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="Prism, Version=6.0.1.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Prism.Core.6.0.1\lib\net45\Prism.dll</HintPath>
47+
<HintPath>..\..\packages\Prism.Core.6.0.1\lib\net45\Prism.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="Prism.Wpf, Version=6.0.1.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Prism.Wpf.6.0.1\lib\net45\Prism.Wpf.dll</HintPath>
51+
<HintPath>..\..\packages\Prism.Wpf.6.0.1\lib\net45\Prism.Wpf.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="System" />
@@ -72,7 +72,7 @@
7272
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<ProjectReference Include="..\src\JuliusSweetland.OptiKey.csproj">
75+
<ProjectReference Include="..\JuliusSweetland.OptiKey\JuliusSweetland.OptiKey.csproj">
7676
<Project>{6865c5af-c6f0-4bda-ba1c-7ae8bc225234}</Project>
7777
<Name>JuliusSweetland.OptiKey</Name>
7878
</ProjectReference>
@@ -85,4 +85,4 @@
8585
<Target Name="AfterBuild">
8686
</Target>
8787
-->
88-
</Project>
88+
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: src/JuliusSweetland.OptiKey.csproj renamed to src/JuliusSweetland.OptiKey/JuliusSweetland.OptiKey.csproj

+28-28
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<IsWebBootstrapper>false</IsWebBootstrapper>
17-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
@@ -73,46 +73,46 @@
7373
<ItemGroup>
7474
<Reference Include="Bass.Net, Version=2.4.11.1, Culture=neutral, PublicKeyToken=b7566c273e6ef480, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\ext\Bass\Bass.Net.dll</HintPath>
76+
<HintPath>..\..\ext\Bass\Bass.Net.dll</HintPath>
7777
</Reference>
7878
<Reference Include="EyeXFramework">
79-
<HintPath>..\ext\TobiiEyeXSdk\EyeXFramework.dll</HintPath>
79+
<HintPath>..\..\ext\TobiiEyeXSdk\EyeXFramework.dll</HintPath>
8080
</Reference>
8181
<Reference Include="log4net">
82-
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
82+
<HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
8383
</Reference>
8484
<Reference Include="MahApps.Metro, Version=1.1.2.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
8585
<SpecificVersion>False</SpecificVersion>
86-
<HintPath>..\packages\MahApps.Metro.1.1.2.0\lib\net45\MahApps.Metro.dll</HintPath>
86+
<HintPath>..\..\packages\MahApps.Metro.1.1.2.0\lib\net45\MahApps.Metro.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
8989
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9090
<SpecificVersion>False</SpecificVersion>
91-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
91+
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
9292
</Reference>
9393
<Reference Include="MouseKeyboardActivityMonitor">
94-
<HintPath>..\packages\MouseKeyboardActivityMonitor.4.0.5150.10665\lib\net20\MouseKeyboardActivityMonitor.dll</HintPath>
94+
<HintPath>..\..\packages\MouseKeyboardActivityMonitor.4.0.5150.10665\lib\net20\MouseKeyboardActivityMonitor.dll</HintPath>
9595
</Reference>
9696
<Reference Include="NBug">
97-
<HintPath>..\packages\NBug.1.2.2\lib\net40-client\NBug.dll</HintPath>
97+
<HintPath>..\..\packages\NBug.1.2.2\lib\net40-client\NBug.dll</HintPath>
9898
</Reference>
9999
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
100100
<SpecificVersion>False</SpecificVersion>
101-
<HintPath>..\ext\TheEyeTribe\Newtonsoft.Json.dll</HintPath>
101+
<HintPath>..\..\ext\TheEyeTribe\Newtonsoft.Json.dll</HintPath>
102102
</Reference>
103103
<Reference Include="Octokit, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
104104
<SpecificVersion>False</SpecificVersion>
105-
<HintPath>..\packages\Octokit.0.16.0\lib\net45\Octokit.dll</HintPath>
105+
<HintPath>..\..\packages\Octokit.0.16.0\lib\net45\Octokit.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Octokit.Reactive">
108-
<HintPath>..\packages\Octokit.Reactive.0.16.0\lib\net45\Octokit.Reactive.dll</HintPath>
108+
<HintPath>..\..\packages\Octokit.Reactive.0.16.0\lib\net45\Octokit.Reactive.dll</HintPath>
109109
<Private>True</Private>
110110
</Reference>
111111
<Reference Include="Prism">
112-
<HintPath>..\packages\Prism.Core.6.0.1\lib\net45\Prism.dll</HintPath>
112+
<HintPath>..\..\packages\Prism.Core.6.0.1\lib\net45\Prism.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Prism.Wpf">
115-
<HintPath>..\packages\Prism.Wpf.6.0.1\lib\net45\Prism.Wpf.dll</HintPath>
115+
<HintPath>..\..\packages\Prism.Wpf.6.0.1\lib\net45\Prism.Wpf.dll</HintPath>
116116
</Reference>
117117
<Reference Include="System" />
118118
<Reference Include="System.Configuration" />
@@ -123,30 +123,30 @@
123123
<Reference Include="System.Net.Http" />
124124
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125125
<SpecificVersion>False</SpecificVersion>
126-
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
126+
<HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
127127
</Reference>
128128
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129129
<SpecificVersion>False</SpecificVersion>
130-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
130+
<HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133133
<SpecificVersion>False</SpecificVersion>
134-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
134+
<HintPath>..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
135135
</Reference>
136136
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137137
<SpecificVersion>False</SpecificVersion>
138-
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
138+
<HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
139139
</Reference>
140140
<Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141141
<SpecificVersion>False</SpecificVersion>
142-
<HintPath>..\packages\Rx-Xaml.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
142+
<HintPath>..\..\packages\Rx-Xaml.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
143143
</Reference>
144144
<Reference Include="System.Speech" />
145145
<Reference Include="System.Threading.Tasks" />
146146
<Reference Include="System.Web.Extensions" />
147147
<Reference Include="System.Windows.Forms" />
148148
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
149-
<HintPath>..\packages\MahApps.Metro.1.1.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
149+
<HintPath>..\..\packages\MahApps.Metro.1.1.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
150150
</Reference>
151151
<Reference Include="System.Xml" />
152152
<Reference Include="Microsoft.CSharp" />
@@ -157,20 +157,20 @@
157157
<RequiredTargetFramework>4.0</RequiredTargetFramework>
158158
</Reference>
159159
<Reference Include="TETControls">
160-
<HintPath>..\ext\TheEyeTribe\TETControls.dll</HintPath>
160+
<HintPath>..\..\ext\TheEyeTribe\TETControls.dll</HintPath>
161161
</Reference>
162162
<Reference Include="TETCSharpClient">
163-
<HintPath>..\ext\TheEyeTribe\TETCSharpClient.dll</HintPath>
163+
<HintPath>..\..\ext\TheEyeTribe\TETCSharpClient.dll</HintPath>
164164
</Reference>
165165
<Reference Include="Tobii.EyeX.Client.Net20">
166-
<HintPath>..\ext\TobiiEyeXSdk\Tobii.EyeX.Client.Net20.dll</HintPath>
166+
<HintPath>..\..\ext\TobiiEyeXSdk\Tobii.EyeX.Client.Net20.dll</HintPath>
167167
</Reference>
168168
<Reference Include="WindowsBase" />
169169
<Reference Include="PresentationCore" />
170170
<Reference Include="PresentationFramework" />
171171
<Reference Include="WindowsInput, Version=1.0.4.0, Culture=neutral, PublicKeyToken=9b287f7dc5073cad, processorArchitecture=MSIL">
172172
<SpecificVersion>False</SpecificVersion>
173-
<HintPath>..\ext\InputSimulator\WindowsInput.dll</HintPath>
173+
<HintPath>..\..\ext\InputSimulator\WindowsInput.dll</HintPath>
174174
</Reference>
175175
</ItemGroup>
176176
<ItemGroup>
@@ -516,11 +516,11 @@
516516
<None Include="Resources\Icons\SVG Source Files\Menu.svg" />
517517
<None Include="Resources\Icons\SVG Source Files\DecreaseOpacity.svg" />
518518
<None Include="Resources\Icons\SVG Source Files\IncreaseOpacity.svg" />
519-
<None Include="..\docs\CREDITS.txt">
519+
<None Include="..\..\docs\CREDITS.txt">
520520
<Link>CREDITS.txt</Link>
521521
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
522522
</None>
523-
<None Include="..\docs\LICENSE.txt">
523+
<None Include="..\..\docs\LICENSE.txt">
524524
<Link>LICENSE.txt</Link>
525525
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
526526
</None>
@@ -533,11 +533,11 @@
533533
<None Include="Resources\Icons\SVG Source Files\ReplayLastMouseAction.svg" />
534534
<None Include="Resources\Icons\SVG Source Files\Cursor.svg" />
535535
<None Include="Resources\Icons\SVG Source Files\MouseMiddleClick.svg" />
536-
<Content Include="..\ext\Bass\bass.dll">
536+
<Content Include="..\..\ext\Bass\bass.dll">
537537
<Link>bass.dll</Link>
538538
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
539539
</Content>
540-
<Content Include="..\ext\TobiiEyeXSdk\Tobii.EyeX.Client.dll">
540+
<Content Include="..\..\ext\TobiiEyeXSdk\Tobii.EyeX.Client.dll">
541541
<Link>Tobii.EyeX.Client.dll</Link>
542542
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
543543
</Content>
@@ -930,4 +930,4 @@
930930
<Target Name="AfterBuild">
931931
</Target>
932932
-->
933-
</Project>
933+
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)