Skip to content

Commit dfdc863

Browse files
BornToBeRootBornToBeRoot
authored
Merge branch 'main' into fix/network_connection_view
2 parents 5174245 + 00182e7 commit dfdc863

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
<PackageReference Include="AWSSDK.Core" Version="3.7.400.33"/>
3030
<PackageReference Include="DnsClient" Version="1.8.0"/>
3131
<PackageReference Include="IPNetwork2" Version="3.0.667"/>
32-
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.3"/>
33-
<PackageReference Include="log4net" Version="3.0.1"/>
32+
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
33+
<PackageReference Include="log4net" Version="3.0.2"/>
3434
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
35-
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0"/>
36-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.0"/>
37-
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.0.0"/>
35+
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
36+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
37+
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
3838
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0"/>
39-
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0"/>
40-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45"/>
41-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5"/>
39+
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
40+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39"/>
41+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6"/>
4242
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
43-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.5"/>
43+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6"/>
4444
</ItemGroup>
4545

4646
<ItemGroup>

‎Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
20-
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0"/>
21-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.0"/>
22-
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.0.0"/>
20+
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
21+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
22+
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
2323
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0"/>
24-
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0"/>
24+
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj"/>

‎Source/NETworkManager.Settings/NETworkManager.Settings.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<PackageReference Include="DnsClient" Version="1.8.0"/>
48-
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.3"/>
49-
<PackageReference Include="log4net" Version="3.0.1"/>
48+
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
49+
<PackageReference Include="log4net" Version="3.0.2"/>
5050
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
51-
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0"/>
52-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.0"/>
53-
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.0.0"/>
51+
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
52+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
53+
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
5454
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0"/>
55-
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0"/>
55+
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
5656
</ItemGroup>
5757
<ItemGroup>
5858
<ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj"/>

‎Source/NETworkManager.Update/NETworkManager.Update.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="log4net" Version="3.0.1"/>
20+
<PackageReference Include="log4net" Version="3.0.2"/>
2121
<PackageReference Include="Octokit" Version="13.0.1"/>
2222
</ItemGroup>
2323
</Project>

‎Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReference Include="DnsClient" Version="1.8.0"/>
21-
<PackageReference Include="log4net" Version="3.0.1"/>
21+
<PackageReference Include="log4net" Version="3.0.2"/>
2222
</ItemGroup>
2323
</Project>

‎Source/NETworkManager.Validators/NETworkManager.Validators.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.3"/>
19+
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
2020
</ItemGroup>
2121
<ItemGroup>
2222
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj"/>

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,25 @@
5858
</ItemGroup>
5959
<ItemGroup>
6060
<PackageReference Include="AirspaceFixer" Version="1.0.6"/>
61-
<PackageReference Include="AWSSDK.EC2" Version="3.7.409"/>
61+
<PackageReference Include="AWSSDK.EC2" Version="3.7.410"/>
6262
<PackageReference Include="DnsClient" Version="1.8.0"/>
6363
<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1"/>
6464
<PackageReference Include="IPNetwork2" Version="3.0.667"/>
65-
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.3"/>
65+
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
6666
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7"/>
6767
<PackageReference Include="LoadingIndicators.WPF" Version="0.0.1"/>
68-
<PackageReference Include="log4net" Version="3.0.1"/>
68+
<PackageReference Include="log4net" Version="3.0.2"/>
6969
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
70-
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0"/>
71-
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.0"/>
72-
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.0.0"/>
70+
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
71+
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.0.1"/>
72+
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
7373
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0"/>
74-
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0"/>
75-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45"/>
76-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.5"/>
74+
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
75+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39"/>
76+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6"/>
7777
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135"/>
7878
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
79-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.5"/>
79+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6"/>
8080
<PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.3"/>
8181
<Reference Include="AxMSTSCLib">
8282
<HintPath>$(TargetDir)\lib\AxMSTSCLib.dll</HintPath>

‎Website/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@docusaurus/core": "3.5.2",
1818
"@docusaurus/preset-classic": "3.5.2",
19-
"@mdx-js/react": "^3.0.0",
19+
"@mdx-js/react": "^3.1.0",
2020
"clsx": "^2.0.0",
2121
"prism-react-renderer": "^2.4.0",
2222
"react": "^18.0.0",

‎Website/yarn.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,10 +1754,10 @@
17541754
unist-util-visit "^5.0.0"
17551755
vfile "^6.0.0"
17561756

1757-
"@mdx-js/react@^3.0.0":
1758-
version "3.0.1"
1759-
resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.0.1.tgz#997a19b3a5b783d936c75ae7c47cfe62f967f746"
1760-
integrity sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==
1757+
"@mdx-js/react@^3.0.0", "@mdx-js/react@^3.1.0":
1758+
version "3.1.0"
1759+
resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.1.0.tgz#c4522e335b3897b9a845db1dbdd2f966ae8fb0ed"
1760+
integrity sha512-QjHtSaoameoalGnKDT3FoIl4+9RwyTmo9ZJGBdLOks/YOiWHoRDI3PUwEzOE7kEmGcV3AFcp9K6dYu9rEuKLAQ==
17611761
dependencies:
17621762
"@types/mdx" "^2.0.0"
17631763

@@ -4608,9 +4608,9 @@ http-parser-js@>=0.5.1:
46084608
integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
46094609

46104610
http-proxy-middleware@^2.0.3:
4611-
version "2.0.6"
4612-
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
4613-
integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
4611+
version "2.0.7"
4612+
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
4613+
integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
46144614
dependencies:
46154615
"@types/http-proxy" "^1.17.8"
46164616
http-proxy "^1.18.1"

0 commit comments

Comments
 (0)