Skip to content

Commit 0b6fda9

Browse files
ThadHouseThadHouse
committed
Build updates for 2018.
1 parent 62ce5dc commit 0b6fda9

File tree

13 files changed

+124
-43
lines changed

13 files changed

+124
-43
lines changed

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# User-specific files
55
*.suo
66
*.user
7-
*.sln.docstates
7+
*.sln.
8+
.vs/
89

910
# Build results
1011
[Dd]ebug/
@@ -203,4 +204,4 @@ ModelManifest.xml
203204
buildLocal.bat
204205

205206
.project
206-
.settings/
207+
.settings/

‎HAL/HAL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>HAL</RootNamespace>
1111
<AssemblyName>HAL</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>

‎LoadTester/LoadTester.csproj

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,8 @@
3737
<HintPath>..\packages\FRC.CameraServer.1.0.2\lib\net45\FRC.CameraServer.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="FRC.NetworkTables.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\FRC.NetworkTables.Core.3.1.8\lib\net45\FRC.NetworkTables.Core.dll</HintPath>
42-
<Private>True</Private>
43-
</Reference>
44-
<Reference Include="FRC.NetworkTables.Core.DesktopLibraries, Version=3.1.8.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\FRC.NetworkTables.Core.DesktopLibraries.3.1.8\lib\net40\FRC.NetworkTables.Core.DesktopLibraries.dll</HintPath>
46-
<Private>True</Private>
40+
<Reference Include="FRC.NetworkTables, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\FRC.NetworkTables.3.1.8\lib\net46\FRC.NetworkTables.dll</HintPath>
4742
</Reference>
4843
<Reference Include="FRC.OpenCvSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4944
<HintPath>..\packages\FRC.OpenCvSharp.1.0.3\lib\net45\FRC.OpenCvSharp.dll</HintPath>
@@ -57,6 +52,21 @@
5752
<HintPath>..\packages\NativeLibraryUtilities.1.0.3\lib\net45\NativeLibraryUtilities.dll</HintPath>
5853
<Private>True</Private>
5954
</Reference>
55+
<Reference Include="Nito.AsyncEx.Context, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Nito.AsyncEx.Context.1.1.0\lib\net46\Nito.AsyncEx.Context.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Nito.AsyncEx.Coordination, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Nito.AsyncEx.Coordination.1.0.2\lib\net46\Nito.AsyncEx.Coordination.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
69+
</Reference>
6070
<Reference Include="System" />
6171
<Reference Include="System.Core" />
6272
<Reference Include="System.Xml.Linq" />

‎LoadTester/packages.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FRC.CameraServer" version="1.0.2" targetFramework="net461" />
4-
<package id="FRC.NetworkTables.Core" version="3.1.8" targetFramework="net461" />
5-
<package id="FRC.NetworkTables.Core.DesktopLibraries" version="3.1.8" targetFramework="net461" />
4+
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
65
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net461" />
76
<package id="FRC.OpenCvSharp.DesktopLibraries" version="1.0.3" targetFramework="net461" />
87
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net461" />
98
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net461" />
9+
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
10+
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
11+
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
12+
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
13+
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
1014
</packages>

‎WPILib.Extras/WPILib.Extras.csproj

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WPILib.Extras</RootNamespace>
1111
<AssemblyName>WPILib.Extras</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -59,9 +59,8 @@
5959
<HintPath>..\packages\FRC.CameraServer.1.0.2\lib\net45\FRC.CameraServer.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="FRC.NetworkTables.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\packages\FRC.NetworkTables.Core.3.1.8\lib\net45\FRC.NetworkTables.Core.dll</HintPath>
64-
<Private>True</Private>
62+
<Reference Include="FRC.NetworkTables, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\FRC.NetworkTables.3.1.8\lib\net46\FRC.NetworkTables.dll</HintPath>
6564
</Reference>
6665
<Reference Include="FRC.OpenCvSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6766
<HintPath>..\packages\FRC.OpenCvSharp.1.0.3\lib\net45\FRC.OpenCvSharp.dll</HintPath>
@@ -71,6 +70,21 @@
7170
<HintPath>..\packages\NativeLibraryUtilities.1.0.3\lib\net45\NativeLibraryUtilities.dll</HintPath>
7271
<Private>True</Private>
7372
</Reference>
73+
<Reference Include="Nito.AsyncEx.Context, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Nito.AsyncEx.Context.1.1.0\lib\net46\Nito.AsyncEx.Context.dll</HintPath>
75+
</Reference>
76+
<Reference Include="Nito.AsyncEx.Coordination, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Nito.AsyncEx.Coordination.1.0.2\lib\net46\Nito.AsyncEx.Coordination.dll</HintPath>
78+
</Reference>
79+
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
81+
</Reference>
82+
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
84+
</Reference>
85+
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
87+
</Reference>
7488
<Reference Include="System" />
7589
<Reference Include="System.Core" />
7690
<Reference Include="System.Xml.Linq" />

‎WPILib.Extras/packages.config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FRC.CameraServer" version="1.0.2" targetFramework="net451" />
4-
<package id="FRC.NetworkTables.Core" version="3.1.8" targetFramework="net451" />
4+
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
55
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net451" />
66
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net451" />
7+
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
8+
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
9+
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
10+
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
11+
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
712
</packages>

‎WPILib.IntegrationTests/WPILib.IntegrationTests.csproj

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>WPILib.IntegrationTests</RootNamespace>
1010
<AssemblyName>WPILib.IntegrationTests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -52,13 +52,8 @@
5252
<HintPath>..\packages\FRC.CameraServer.1.0.2\lib\net45\FRC.CameraServer.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="FRC.NetworkTables.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\FRC.NetworkTables.Core.3.1.8\lib\net45\FRC.NetworkTables.Core.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="FRC.NetworkTables.Core.DesktopLibraries, Version=3.1.8.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\FRC.NetworkTables.Core.DesktopLibraries.3.1.8\lib\net40\FRC.NetworkTables.Core.DesktopLibraries.dll</HintPath>
61-
<Private>True</Private>
55+
<Reference Include="FRC.NetworkTables, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\FRC.NetworkTables.3.1.8\lib\net46\FRC.NetworkTables.dll</HintPath>
6257
</Reference>
6358
<Reference Include="FRC.OpenCvSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6459
<HintPath>..\packages\FRC.OpenCvSharp.1.0.3\lib\net45\FRC.OpenCvSharp.dll</HintPath>
@@ -73,6 +68,21 @@
7368
<HintPath>..\packages\NativeLibraryUtilities.1.0.3\lib\net45\NativeLibraryUtilities.dll</HintPath>
7469
<Private>True</Private>
7570
</Reference>
71+
<Reference Include="Nito.AsyncEx.Context, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Nito.AsyncEx.Context.1.1.0\lib\net46\Nito.AsyncEx.Context.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Nito.AsyncEx.Coordination, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Nito.AsyncEx.Coordination.1.0.2\lib\net46\Nito.AsyncEx.Coordination.dll</HintPath>
76+
</Reference>
77+
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
82+
</Reference>
83+
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
85+
</Reference>
7686
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
7787
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
7888
<Private>True</Private>

‎WPILib.IntegrationTests/packages.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FRC.CameraServer" version="1.0.2" targetFramework="net451" />
4-
<package id="FRC.NetworkTables.Core" version="3.1.8" targetFramework="net451" />
5-
<package id="FRC.NetworkTables.Core.DesktopLibraries" version="3.1.8" targetFramework="net451" />
4+
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
65
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net451" />
76
<package id="FRC.OpenCvSharp.DesktopLibraries" version="1.0.3" targetFramework="net451" />
87
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net451" />
98
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net451" />
9+
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
10+
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
11+
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
12+
<package id="Nito.Collections.Deque" version="1.0.0" targetFramework="net461" />
13+
<package id="Nito.Disposables" version="1.0.0" targetFramework="net461" />
1014
<package id="NUnit" version="3.6.0" targetFramework="net451" />
1115
</packages>

‎WPILib.Tests/WPILib.Tests.csproj

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>WPILib.Tests</RootNamespace>
1010
<AssemblyName>WPILib.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -60,13 +60,8 @@
6060
<HintPath>..\packages\FRC.CameraServer.1.0.2\lib\net45\FRC.CameraServer.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="FRC.NetworkTables.Core, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\packages\FRC.NetworkTables.Core.3.1.8\lib\net45\FRC.NetworkTables.Core.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
67-
<Reference Include="FRC.NetworkTables.Core.DesktopLibraries, Version=3.1.8.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\FRC.NetworkTables.Core.DesktopLibraries.3.1.8\lib\net40\FRC.NetworkTables.Core.DesktopLibraries.dll</HintPath>
69-
<Private>True</Private>
63+
<Reference Include="FRC.NetworkTables, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
64+
<HintPath>..\packages\FRC.NetworkTables.3.1.8\lib\net46\FRC.NetworkTables.dll</HintPath>
7065
</Reference>
7166
<Reference Include="FRC.OpenCvSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7267
<HintPath>..\packages\FRC.OpenCvSharp.1.0.3\lib\net45\FRC.OpenCvSharp.dll</HintPath>
@@ -89,6 +84,21 @@
8984
<HintPath>..\packages\NativeLibraryUtilities.1.0.3\lib\net45\NativeLibraryUtilities.dll</HintPath>
9085
<Private>True</Private>
9186
</Reference>
87+
<Reference Include="Nito.AsyncEx.Context, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Nito.AsyncEx.Context.1.1.0\lib\net46\Nito.AsyncEx.Context.dll</HintPath>
89+
</Reference>
90+
<Reference Include="Nito.AsyncEx.Coordination, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Nito.AsyncEx.Coordination.1.0.2\lib\net46\Nito.AsyncEx.Coordination.dll</HintPath>
92+
</Reference>
93+
<Reference Include="Nito.AsyncEx.Tasks, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Nito.AsyncEx.Tasks.1.1.0\lib\net46\Nito.AsyncEx.Tasks.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Nito.Collections.Deque, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Nito.Collections.Deque.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Collections.Deque.dll</HintPath>
98+
</Reference>
99+
<Reference Include="Nito.Disposables, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
100+
<HintPath>..\packages\Nito.Disposables.1.0.0\lib\portable45-net45+win8+wp8+wpa81\Nito.Disposables.dll</HintPath>
101+
</Reference>
92102
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
93103
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
94104
<Private>True</Private>

‎WPILib.Tests/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
</configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

0 commit comments

Comments
 (0)