Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 66b8f5e

Browse files
committed
update packages
1 parent a8cafde commit 66b8f5e

File tree

5 files changed

+78
-36
lines changed

5 files changed

+78
-36
lines changed

Deploy/SpcodeUpdater/App.config

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
23+
</dependentAssembly>
24+
</assemblyBinding>
25+
</runtime>
626
</configuration>

Deploy/SpcodeUpdater/SpcodeUpdater.csproj

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
8282
<HintPath>..\..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
8383
</Reference>
84-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
85-
<HintPath>..\..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
84+
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.0.12, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\SharpZipLib.1.4.0\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
8686
</Reference>
8787
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8888
<HintPath>..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
@@ -95,15 +95,18 @@
9595
<Private>True</Private>
9696
<Private>True</Private>
9797
</Reference>
98+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
99+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
100+
</Reference>
98101
<Reference Include="System.ComponentModel.Composition" />
99-
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100-
<HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
102+
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
103+
<HintPath>..\..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
101104
<Private>True</Private>
102105
<Private>True</Private>
103106
</Reference>
104107
<Reference Include="System.Data" />
105-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
108+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
107110
</Reference>
108111
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109112
<HintPath>..\..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -152,6 +155,9 @@
152155
<Private>True</Private>
153156
<Private>True</Private>
154157
</Reference>
158+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
159+
<HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
160+
</Reference>
155161
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
156162
<HintPath>..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
157163
<Private>True</Private>
@@ -163,18 +169,24 @@
163169
<Private>True</Private>
164170
</Reference>
165171
<Reference Include="System.Numerics" />
172+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
174+
</Reference>
166175
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
167176
<HintPath>..\..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
168177
<Private>True</Private>
169178
<Private>True</Private>
170179
</Reference>
171-
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
172-
<HintPath>..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
180+
<Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
181+
<HintPath>..\..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
173182
<Private>True</Private>
174183
<Private>True</Private>
175184
</Reference>
176-
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
177-
<HintPath>..\..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
185+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
186+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
187+
</Reference>
188+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
189+
<HintPath>..\..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
178190
<Private>True</Private>
179191
<Private>True</Private>
180192
</Reference>
@@ -189,7 +201,7 @@
189201
<Private>True</Private>
190202
</Reference>
191203
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
192-
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
204+
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
193205
<Private>True</Private>
194206
<Private>True</Private>
195207
</Reference>
@@ -203,8 +215,8 @@
203215
<Private>True</Private>
204216
<Private>True</Private>
205217
</Reference>
206-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
207-
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
218+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
219+
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
208220
<Private>True</Private>
209221
<Private>True</Private>
210222
</Reference>
@@ -213,11 +225,14 @@
213225
<Private>True</Private>
214226
<Private>True</Private>
215227
</Reference>
228+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
229+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
230+
</Reference>
216231
<Reference Include="System.Windows.Forms" />
217232
<Reference Include="System.Xml" />
218233
<Reference Include="System.Xml.Linq" />
219234
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
220-
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
235+
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
221236
<Private>True</Private>
222237
<Private>True</Private>
223238
</Reference>
@@ -246,16 +261,18 @@
246261
</EmbeddedResource>
247262
</ItemGroup>
248263
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
249-
<Import Project="..\..\packages\Fody.6.5.5\build\Fody.targets" Condition="Exists('..\..\packages\Fody.6.5.5\build\Fody.targets')" />
250264
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
251265
<PropertyGroup>
252266
<ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
253267
</PropertyGroup>
254-
<Error Condition="!Exists('..\..\packages\Fody.6.5.5\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.6.5.5\build\Fody.targets'))" />
255268
<Error Condition="!Exists('..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
256269
<Error Condition="!Exists('..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
270+
<Error Condition="!Exists('..\..\packages\Fody.6.6.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.6.6.3\build\Fody.targets'))" />
271+
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
257272
</Target>
258273
<Import Project="..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
274+
<Import Project="..\..\packages\Fody.6.6.3\build\Fody.targets" Condition="Exists('..\..\packages\Fody.6.6.3\build\Fody.targets')" />
275+
<Import Project="..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
259276
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
260277
Other similar extension points exist, see Microsoft.Common.targets.
261278
<Target Name="BeforeBuild">

Deploy/SpcodeUpdater/packages.config

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
4-
<package id="Fody" version="6.5.5" targetFramework="net48" developmentDependency="true" />
5-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net48" />
4+
<package id="Fody" version="6.6.3" targetFramework="net48" developmentDependency="true" />
5+
<package id="Microsoft.NETCore.Platforms" version="6.0.5" targetFramework="net48" />
66
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
7-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net48" />
8-
<package id="SharpZipLib" version="1.3.3" targetFramework="net48" />
7+
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
8+
<package id="SharpZipLib" version="1.4.0" targetFramework="net48" />
99
<package id="System.AppContext" version="4.3.0" targetFramework="net48" />
10+
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
1011
<package id="System.Collections" version="4.3.0" targetFramework="net48" />
1112
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
12-
<package id="System.Console" version="4.3.0" targetFramework="net48" />
13+
<package id="System.Console" version="4.3.1" targetFramework="net48" />
1314
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
14-
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net48" />
15+
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net48" />
1516
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
1617
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
1718
<package id="System.Globalization" version="4.3.0" targetFramework="net48" />
@@ -23,30 +24,34 @@
2324
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net48" />
2425
<package id="System.Linq" version="4.3.0" targetFramework="net48" />
2526
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
27+
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
2628
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
27-
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net48" />
29+
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net48" />
2830
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
31+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
2932
<package id="System.ObjectModel" version="4.3.0" targetFramework="net48" />
3033
<package id="System.Reflection" version="4.3.0" targetFramework="net48" />
3134
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net48" />
3235
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net48" />
3336
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net48" />
34-
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
35-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net48" />
37+
<package id="System.Runtime" version="4.3.1" targetFramework="net48" />
38+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
39+
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net48" />
3640
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net48" />
3741
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net48" />
3842
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
3943
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net48" />
40-
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
44+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
4145
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
4246
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
43-
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
47+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
4448
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net48" />
4549
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net48" />
46-
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net48"/>
50+
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net48" />
4751
<package id="System.Threading" version="4.3.0" targetFramework="net48" />
4852
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net48" />
53+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
4954
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
50-
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net48" />
55+
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net48" />
5156
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
5257
</packages>

Spcode.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@
563563
<Version>6.1.3.50</Version>
564564
</PackageReference>
565565
<PackageReference Include="ByteSize">
566-
<Version>2.0.0</Version>
566+
<Version>2.1.1</Version>
567567
</PackageReference>
568568
<PackageReference Include="Costura.Fody">
569569
<Version>5.7.0</Version>
@@ -580,7 +580,7 @@
580580
<Version>1.6.5</Version>
581581
</PackageReference>
582582
<PackageReference Include="MdXaml">
583-
<Version>1.11.0</Version>
583+
<Version>1.16.0</Version>
584584
</PackageReference>
585585
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell">
586586
<Version>1.1.4</Version>
@@ -589,13 +589,13 @@
589589
<Version>2.0.3</Version>
590590
</PackageReference>
591591
<PackageReference Include="Newtonsoft.Json">
592-
<Version>12.0.3</Version>
592+
<Version>13.0.1</Version>
593593
</PackageReference>
594594
<PackageReference Include="Octokit">
595-
<Version>0.50.0</Version>
595+
<Version>3.0.0</Version>
596596
</PackageReference>
597597
<PackageReference Include="SSH.NET">
598-
<Version>2016.1.0</Version>
598+
<Version>2020.0.2</Version>
599599
</PackageReference>
600600
<PackageReference Include="Windows7APICodePack-Shell">
601601
<Version>1.1.0</Version>

UI/Components/EditorElement/EditorElementIntellisenseController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private void InterruptLoadAutoCompletes(SMDefinition smDef)
154154
_acEntries = smDef.ProduceACNodes();
155155
Dispatcher?.Invoke(() =>
156156
{
157-
_acEntries = _acEntries;
157+
//_acEntries = _acEntries;
158158
AutoCompleteBox.ItemsSource = _acEntries;
159159
PreProcAutocompleteBox.ItemsSource = PreProcNodes;
160160
_smDef = smDef;

0 commit comments

Comments
 (0)