Horizon – Diff between revs 5 and 12

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 5 Rev 12
Line 63... Line 63...
63 <ItemGroup> 63 <ItemGroup>
64 <Reference Include="Be.Windows.Forms.HexBox, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL"> 64 <Reference Include="Be.Windows.Forms.HexBox, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
65 <HintPath>..\packages\Be.Windows.Forms.HexBox.1.6.1\lib\net40\Be.Windows.Forms.HexBox.dll</HintPath> 65 <HintPath>..\packages\Be.Windows.Forms.HexBox.1.6.1\lib\net40\Be.Windows.Forms.HexBox.dll</HintPath>
66 </Reference> 66 </Reference>
67 <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"> 67 <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
68 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.2.3\lib\net452\BouncyCastle.Crypto.dll</HintPath> 68 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.3.0\lib\net452\BouncyCastle.Crypto.dll</HintPath>
69 </Reference> 69 </Reference>
70 <Reference Include="Jot, Version=2.1.17.0, Culture=neutral, PublicKeyToken=6b498f69c5f88322, processorArchitecture=MSIL"> 70 <Reference Include="Jot, Version=2.1.17.0, Culture=neutral, PublicKeyToken=6b498f69c5f88322, processorArchitecture=MSIL">
71 <HintPath>..\packages\Jot.2.1.17\lib\netstandard2.0\Jot.dll</HintPath> 71 <HintPath>..\packages\Jot.2.1.17\lib\netstandard2.0\Jot.dll</HintPath>
72 </Reference> 72 </Reference>
73 <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 73 <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Line 80... Line 80...
80 <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath> 80 <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
81 </Reference> 81 </Reference>
82 <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> 82 <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
83 <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath> 83 <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
84 </Reference> 84 </Reference>
85 <Reference Include="NetSparkle, Version=2.2.3.0, Culture=neutral, processorArchitecture=MSIL"> 85 <Reference Include="NetSparkle, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
86 <HintPath>..\packages\NetSparkleUpdater.SparkleUpdater.2.2.3\lib\net452\NetSparkle.dll</HintPath> 86 <HintPath>..\packages\NetSparkleUpdater.SparkleUpdater.2.3.0\lib\net452\NetSparkle.dll</HintPath>
87 </Reference> 87 </Reference>
88 <Reference Include="NetSparkleUpdater.UI.WinForms, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> 88 <Reference Include="NetSparkleUpdater.UI.WinForms, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
89 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.2.3\lib\net452\NetSparkleUpdater.UI.WinForms.dll</HintPath> 89 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.3.0\lib\net452\NetSparkleUpdater.UI.WinForms.dll</HintPath>
90 </Reference> 90 </Reference>
91 <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> 91 <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
92 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.2.3\lib\net452\Newtonsoft.Json.dll</HintPath> 92 <HintPath>..\packages\NetSparkleUpdater.UI.WinForms.NetFramework.2.3.0\lib\net452\Newtonsoft.Json.dll</HintPath>
93 </Reference> 93 </Reference>
94 <Reference Include="PresentationFramework" /> 94 <Reference Include="PresentationFramework" />
95 <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL"> 95 <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
96 <HintPath>..\packages\Serilog.3.0.1\lib\net471\Serilog.dll</HintPath> 96 <HintPath>..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
97 </Reference> 97 </Reference>
98 <Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL"> 98 <Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
99 <HintPath>..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath> 99 <HintPath>..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
100 </Reference> 100 </Reference>
101 <Reference Include="System" /> 101 <Reference Include="System" />
Line 113... Line 113...
113 <HintPath>..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath> 113 <HintPath>..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
114 </Reference> 114 </Reference>
115 <Reference Include="System.Data.SQLite.Linq, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL"> 115 <Reference Include="System.Data.SQLite.Linq, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
116 <HintPath>..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath> 116 <HintPath>..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
117 </Reference> 117 </Reference>
-   118 <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-   119 <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-   120 </Reference>
118 <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 121 <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
119 <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath> 122 <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
120 <Private>True</Private> 123 <Private>True</Private>
121 <Private>True</Private> 124 <Private>True</Private>
122 </Reference> 125 </Reference>
Line 165... Line 168...
165 <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 168 <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
166 <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath> 169 <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
167 <Private>True</Private> 170 <Private>True</Private>
168 <Private>True</Private> 171 <Private>True</Private>
169 </Reference> 172 </Reference>
-   173 <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-   174 <HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-   175 </Reference>
-   176 <Reference Include="System.Text.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-   177 <HintPath>..\packages\System.Text.Json.7.0.0\lib\net462\System.Text.Json.dll</HintPath>
-   178 </Reference>
170 <Reference Include="System.Threading.Tasks.Dataflow, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 179 <Reference Include="System.Threading.Tasks.Dataflow, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
171 <HintPath>..\packages\System.Threading.Tasks.Dataflow.7.0.0\lib\net462\System.Threading.Tasks.Dataflow.dll</HintPath> 180 <HintPath>..\packages\System.Threading.Tasks.Dataflow.7.0.0\lib\net462\System.Threading.Tasks.Dataflow.dll</HintPath>
172 </Reference> 181 </Reference>
173 <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 182 <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
174 <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath> 183 <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
175 </Reference> 184 </Reference>
-   185 <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-   186 <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-   187 </Reference>
176 <Reference Include="System.Windows.Forms" /> 188 <Reference Include="System.Windows.Forms" />
177 <Reference Include="System.Xaml" /> 189 <Reference Include="System.Xaml" />
178 <Reference Include="System.Xml" /> 190 <Reference Include="System.Xml" />
179 <Reference Include="System.Xml.Linq" /> 191 <Reference Include="System.Xml.Linq" />
180 <Reference Include="VirtualFileDataObject, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e9db8471034a9d23, processorArchitecture=MSIL"> 192 <Reference Include="VirtualFileDataObject, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e9db8471034a9d23, processorArchitecture=MSIL">
181 <HintPath>..\packages\VirtualFileDataObject.1.0.0.0\lib\net40\VirtualFileDataObject.dll</HintPath> 193 <HintPath>..\packages\VirtualFileDataObject.1.0.0.0\lib\net40\VirtualFileDataObject.dll</HintPath>
182 </Reference> 194 </Reference>
-   195 <Reference Include="WatsonTcp, Version=6.0.6.0, Culture=neutral, PublicKeyToken=c61f5f04303a13b3, processorArchitecture=MSIL">
-   196 <HintPath>..\packages\WatsonTcp.6.0.6\lib\net462\WatsonTcp.dll</HintPath>
-   197 </Reference>
183 <Reference Include="WindowsBase" /> 198 <Reference Include="WindowsBase" />
-   199 <Reference Include="XmlRpcCs, Version=2.1.1.2, Culture=neutral, processorArchitecture=MSIL">
-   200 <HintPath>..\packages\XmlRpcCs.2.1.1.2\lib\net461\XmlRpcCs.dll</HintPath>
-   201 </Reference>
184 </ItemGroup> 202 </ItemGroup>
185 <ItemGroup> 203 <ItemGroup>
186 <Compile Include="AboutForm.cs"> 204 <Compile Include="AboutForm.cs">
187 <SubType>Form</SubType> 205 <SubType>Form</SubType>
188 </Compile> 206 </Compile>
Line 195... Line 213...
195 <Compile Include="Database\SnapshotNoteUpdateEventArgs.cs" /> 213 <Compile Include="Database\SnapshotNoteUpdateEventArgs.cs" />
196 <Compile Include="Database\SnapshotNoteUpdateFailureEventArgs.cs" /> 214 <Compile Include="Database\SnapshotNoteUpdateFailureEventArgs.cs" />
197 <Compile Include="Snapshots\CreateSnapshotProgress.cs" /> 215 <Compile Include="Snapshots\CreateSnapshotProgress.cs" />
198 <Compile Include="Snapshots\CreateSnapshotProgressFailure.cs" /> 216 <Compile Include="Snapshots\CreateSnapshotProgressFailure.cs" />
199 <Compile Include="Snapshots\CreateSnapshotProgressSuccess.cs" /> 217 <Compile Include="Snapshots\CreateSnapshotProgressSuccess.cs" />
-   218 <Compile Include="Snapshots\TransferSnapshot.cs" />
200 <Compile Include="Utilities\LogMemorySink.cs" /> 219 <Compile Include="Utilities\LogMemorySink.cs" />
201 <Compile Include="LogViewForm.cs"> 220 <Compile Include="LogViewForm.cs">
202 <SubType>Form</SubType> 221 <SubType>Form</SubType>
203 </Compile> 222 </Compile>
204 <Compile Include="LogViewForm.Designer.cs"> 223 <Compile Include="LogViewForm.Designer.cs">
Line 236... Line 255...
236 <SubType>Component</SubType> 255 <SubType>Component</SubType>
237 </Compile> 256 </Compile>
238 <Compile Include="Utilities\Controls\ReadOnlyRickTextBox.cs"> 257 <Compile Include="Utilities\Controls\ReadOnlyRickTextBox.cs">
239 <SubType>Component</SubType> 258 <SubType>Component</SubType>
240 </Compile> 259 </Compile>
-   260 <Compile Include="Utilities\Networking\Miscellaneous.cs" />
241 <Compile Include="Utilities\Serialization\Serialization.cs" /> 261 <Compile Include="Utilities\Serialization\Serialization.cs" />
242 <Compile Include="Utilities\Serialization\SerializationFailure.cs" /> 262 <Compile Include="Utilities\Serialization\SerializationFailure.cs" />
243 <Compile Include="Utilities\Serialization\SerializationState.cs" /> 263 <Compile Include="Utilities\Serialization\SerializationState.cs" />
244 <Compile Include="Utilities\Serialization\SerializationSuccess.cs" /> 264 <Compile Include="Utilities\Serialization\SerializationSuccess.cs" />
245 <Compile Include="MainForm.cs"> 265 <Compile Include="MainForm.cs">
Line 285... Line 305...
285 <EmbeddedResource Include="LogViewForm.resx"> 305 <EmbeddedResource Include="LogViewForm.resx">
286 <DependentUpon>LogViewForm.cs</DependentUpon> 306 <DependentUpon>LogViewForm.cs</DependentUpon>
287 </EmbeddedResource> 307 </EmbeddedResource>
288 <EmbeddedResource Include="MainForm.resx"> 308 <EmbeddedResource Include="MainForm.resx">
289 <DependentUpon>MainForm.cs</DependentUpon> 309 <DependentUpon>MainForm.cs</DependentUpon>
-   310 <SubType>Designer</SubType>
290 </EmbeddedResource> 311 </EmbeddedResource>
291 <EmbeddedResource Include="ManageFoldersForm.resx"> 312 <EmbeddedResource Include="ManageFoldersForm.resx">
292 <DependentUpon>ManageFoldersForm.cs</DependentUpon> 313 <DependentUpon>ManageFoldersForm.cs</DependentUpon>
293 </EmbeddedResource> 314 </EmbeddedResource>
294 <EmbeddedResource Include="Properties\Resources.resx"> 315 <EmbeddedResource Include="Properties\Resources.resx">
Line 330... Line 351...
330 <Content Include="img\computer.png" /> 351 <Content Include="img\computer.png" />
331 <Content Include="img\download.png" /> 352 <Content Include="img\download.png" />
332 <Content Include="img\engineering.png" /> 353 <Content Include="img\engineering.png" />
333 <Content Include="img\loop.png" /> 354 <Content Include="img\loop.png" />
334 <Content Include="img\move.png" /> 355 <Content Include="img\move.png" />
-   356 <Content Include="img\neural.png" />
335 <Content Include="img\note.png" /> 357 <Content Include="img\note.png" />
336 <Content Include="img\redo.png" /> 358 <Content Include="img\redo.png" />
337 <Content Include="img\tool-box.png" /> 359 <Content Include="img\tool-box.png" />
338 <Content Include="img\update.png" /> 360 <Content Include="img\update.png" />
339 <Content Include="img\upload.png" /> 361 <Content Include="img\upload.png" />
Line 361... Line 383...
361 <ItemGroup> 383 <ItemGroup>
362 <ProjectReference Include="..\Configuration\Configuration.csproj"> 384 <ProjectReference Include="..\Configuration\Configuration.csproj">
363 <Project>{42feb6ec-5f7d-45a4-a28c-6971fb043c1e}</Project> 385 <Project>{42feb6ec-5f7d-45a4-a28c-6971fb043c1e}</Project>
364 <Name>Configuration</Name> 386 <Name>Configuration</Name>
365 </ProjectReference> 387 </ProjectReference>
-   388 <ProjectReference Include="..\Mono.Zeroconf\src\Mono.Zeroconf.Providers.Bonjour\Mono.Zeroconf.Providers.Bonjour.csproj">
-   389 <Project>{623325e2-5821-4701-a40c-3759097008dd}</Project>
-   390 <Name>Mono.Zeroconf.Providers.Bonjour</Name>
-   391 </ProjectReference>
-   392 <ProjectReference Include="..\Mono.Zeroconf\src\Mono.Zeroconf\Mono.Zeroconf.csproj">
-   393 <Project>{5cf88e3a-13dd-4114-bad9-da826946516f}</Project>
-   394 <Name>Mono.Zeroconf</Name>
-   395 </ProjectReference>
366 <ProjectReference Include="..\TrackedFolders\TrackedFolders.csproj"> 396 <ProjectReference Include="..\TrackedFolders\TrackedFolders.csproj">
367 <Project>{C035AD19-15BA-4D59-9460-D46C38FCF69F}</Project> 397 <Project>{C035AD19-15BA-4D59-9460-D46C38FCF69F}</Project>
368 <Name>TrackedFolders</Name> 398 <Name>TrackedFolders</Name>
369 </ProjectReference> 399 </ProjectReference>
370 </ItemGroup> 400 </ItemGroup>
Line 378... Line 408...
378 <Visible>False</Visible> 408 <Visible>False</Visible>
379 <ProductName>.NET Framework 3.5 SP1</ProductName> 409 <ProductName>.NET Framework 3.5 SP1</ProductName>
380 <Install>false</Install> 410 <Install>false</Install>
381 </BootstrapperPackage> 411 </BootstrapperPackage>
382 </ItemGroup> 412 </ItemGroup>
-   413 <ItemGroup />
383 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 414 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
384 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 415 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
385 <PropertyGroup> 416 <PropertyGroup>
386 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> 417 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
387 </PropertyGroup> 418 </PropertyGroup>