Skip to content

Commit ccb0de9

Browse files
ThadHouseThadHouse
committed
Switches to updated FRC Utilities library
1 parent 65c1c98 commit ccb0de9

File tree

8 files changed

+193
-321
lines changed

8 files changed

+193
-321
lines changed

‎NetworkTables.sln

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26124.0
3+
VisualStudioVersion = 15.0.26403.7
54
MinimumVisualStudioVersion = 15.0.26124.0
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9C2F4909-9BE2-437D-862C-4E23155C2A7A}"
76
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRC.NetworkTables", "src\FRC.NetworkTables\FRC.NetworkTables.csproj", "{20D7E2A0-AA97-4613-B32C-8D3706FAF708}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRC.NetworkTables", "src\FRC.NetworkTables\FRC.NetworkTables.csproj", "{20D7E2A0-AA97-4613-B32C-8D3706FAF708}"
98
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRC.NetworkTables.Core", "src\FRC.NetworkTables.Core\FRC.NetworkTables.Core.csproj", "{E4577F32-D5E8-4191-8C29-124EBC15EFE9}"
9+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRC.NetworkTables.Core", "src\FRC.NetworkTables.Core\FRC.NetworkTables.Core.csproj", "{E4577F32-D5E8-4191-8C29-124EBC15EFE9}"
1110
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRC.NetworkTables.Core.DesktopLibraries", "src\FRC.NetworkTables.Core.DesktopLibraries\FRC.NetworkTables.Core.DesktopLibraries.csproj", "{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRC.NetworkTables.Core.DesktopLibraries", "src\FRC.NetworkTables.Core.DesktopLibraries\FRC.NetworkTables.Core.DesktopLibraries.csproj", "{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}"
1312
EndProject
1413
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{44BF4692-6DAD-4EEA-9A02-63920115AF2B}"
1514
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkTables.Core.Test", "test\NetworkTables.Core.Test\NetworkTables.Core.Test.csproj", "{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkTables.Core.Test", "test\NetworkTables.Core.Test\NetworkTables.Core.Test.csproj", "{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}"
1716
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkTables.Test", "test\NetworkTables.Test\NetworkTables.Test.csproj", "{06EBE437-BE46-4225-95DA-250472C7BEA3}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkTables.Test", "test\NetworkTables.Test\NetworkTables.Test.csproj", "{06EBE437-BE46-4225-95DA-250472C7BEA3}"
1918
EndProject
2019
Global
2120
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,70 +25,70 @@ Global
2625
Release|x64 = Release|x64
2726
Release|x86 = Release|x86
2827
EndGlobalSection
29-
GlobalSection(SolutionProperties) = preSolution
30-
HideSolutionNode = FALSE
31-
EndGlobalSection
3228
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3329
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3430
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x64.ActiveCfg = Debug|x64
36-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x64.Build.0 = Debug|x64
37-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x86.ActiveCfg = Debug|x86
38-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x86.Build.0 = Debug|x86
31+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x64.ActiveCfg = Debug|Any CPU
32+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x64.Build.0 = Debug|Any CPU
33+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x86.ActiveCfg = Debug|Any CPU
34+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Debug|x86.Build.0 = Debug|Any CPU
3935
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|Any CPU.ActiveCfg = Release|Any CPU
4036
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x64.ActiveCfg = Release|x64
42-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x64.Build.0 = Release|x64
43-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x86.ActiveCfg = Release|x86
44-
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x86.Build.0 = Release|x86
37+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x64.ActiveCfg = Release|Any CPU
38+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x64.Build.0 = Release|Any CPU
39+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x86.ActiveCfg = Release|Any CPU
40+
{20D7E2A0-AA97-4613-B32C-8D3706FAF708}.Release|x86.Build.0 = Release|Any CPU
4541
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4642
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x64.ActiveCfg = Debug|x64
48-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x64.Build.0 = Debug|x64
49-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x86.ActiveCfg = Debug|x86
50-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x86.Build.0 = Debug|x86
43+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x64.ActiveCfg = Debug|Any CPU
44+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x64.Build.0 = Debug|Any CPU
45+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x86.ActiveCfg = Debug|Any CPU
46+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Debug|x86.Build.0 = Debug|Any CPU
5147
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
5248
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x64.ActiveCfg = Release|x64
54-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x64.Build.0 = Release|x64
55-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x86.ActiveCfg = Release|x86
56-
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x86.Build.0 = Release|x86
49+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x64.ActiveCfg = Release|Any CPU
50+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x64.Build.0 = Release|Any CPU
51+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x86.ActiveCfg = Release|Any CPU
52+
{E4577F32-D5E8-4191-8C29-124EBC15EFE9}.Release|x86.Build.0 = Release|Any CPU
5753
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5854
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x64.ActiveCfg = Debug|x64
60-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x64.Build.0 = Debug|x64
61-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x86.ActiveCfg = Debug|x86
62-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x86.Build.0 = Debug|x86
55+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x64.ActiveCfg = Debug|Any CPU
56+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x64.Build.0 = Debug|Any CPU
57+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x86.ActiveCfg = Debug|Any CPU
58+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Debug|x86.Build.0 = Debug|Any CPU
6359
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
6460
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|Any CPU.Build.0 = Release|Any CPU
65-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x64.ActiveCfg = Release|x64
66-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x64.Build.0 = Release|x64
67-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x86.ActiveCfg = Release|x86
68-
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x86.Build.0 = Release|x86
61+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x64.ActiveCfg = Release|Any CPU
62+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x64.Build.0 = Release|Any CPU
63+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x86.ActiveCfg = Release|Any CPU
64+
{EE176693-9FBA-43C6-B97A-D7A79DEE16B6}.Release|x86.Build.0 = Release|Any CPU
6965
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7066
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x64.ActiveCfg = Debug|x64
72-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x64.Build.0 = Debug|x64
73-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x86.ActiveCfg = Debug|x86
74-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x86.Build.0 = Debug|x86
67+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x64.ActiveCfg = Debug|Any CPU
68+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x64.Build.0 = Debug|Any CPU
69+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x86.ActiveCfg = Debug|Any CPU
70+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Debug|x86.Build.0 = Debug|Any CPU
7571
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|Any CPU.ActiveCfg = Release|Any CPU
7672
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x64.ActiveCfg = Release|x64
78-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x64.Build.0 = Release|x64
79-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x86.ActiveCfg = Release|x86
80-
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x86.Build.0 = Release|x86
73+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x64.ActiveCfg = Release|Any CPU
74+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x64.Build.0 = Release|Any CPU
75+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x86.ActiveCfg = Release|Any CPU
76+
{070CCC8C-ECEE-4B59-A94A-A4BD1E330803}.Release|x86.Build.0 = Release|Any CPU
8177
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8278
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
83-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x64.ActiveCfg = Debug|x64
84-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x64.Build.0 = Debug|x64
85-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x86.ActiveCfg = Debug|x86
86-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x86.Build.0 = Debug|x86
79+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x64.ActiveCfg = Debug|Any CPU
80+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x64.Build.0 = Debug|Any CPU
81+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Debug|x86.Build.0 = Debug|Any CPU
8783
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
8884
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|Any CPU.Build.0 = Release|Any CPU
89-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x64.ActiveCfg = Release|x64
90-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x64.Build.0 = Release|x64
91-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x86.ActiveCfg = Release|x86
92-
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x86.Build.0 = Release|x86
85+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x64.ActiveCfg = Release|Any CPU
86+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x64.Build.0 = Release|Any CPU
87+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x86.ActiveCfg = Release|Any CPU
88+
{06EBE437-BE46-4225-95DA-250472C7BEA3}.Release|x86.Build.0 = Release|Any CPU
89+
EndGlobalSection
90+
GlobalSection(SolutionProperties) = preSolution
91+
HideSolutionNode = FALSE
9392
EndGlobalSection
9493
GlobalSection(NestedProjects) = preSolution
9594
{20D7E2A0-AA97-4613-B32C-8D3706FAF708} = {9C2F4909-9BE2-437D-862C-4E23155C2A7A}

‎src/FRC.NetworkTables.Core/FRC.NetworkTables.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<Compile Include="..\Shared\*.cs;..\Shared\Tables\*.cs;..\Shared\Wire\*.cs;..\Shared\Exceptions\*.cs" Exclude="Output\**\*;Exceptions\**\*;Tables\**\*;Wire\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
2929
</ItemGroup>
3030

31-
<ItemGroup>
32-
<PackageReference Include="NativeLibraryUtilities" Version="1.0.3" />
33-
</ItemGroup>
34-
3531
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3632
<Reference Include="System" />
3733
<Reference Include="Microsoft.CSharp" />
@@ -42,6 +38,10 @@
4238
<Reference Include="Microsoft.CSharp" />
4339
</ItemGroup>
4440

41+
<ItemGroup>
42+
<PackageReference Include="FRC.Utilities" Version="2.0.0-alpha2" />
43+
</ItemGroup>
44+
4545
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
4646
<DefineConstants>$(DefineConstants);NET40</DefineConstants>
4747
</PropertyGroup>

0 commit comments

Comments
 (0)