Skip to content

Commit 9bbfd36

Browse files
authored
Feature/Fix: Use Dragablz with custom fix (BornToBeRoot#1712)
* Feature: Use Dragablz with custom fix * Docs: Add BornToBeRoot#1712 * Fix: Update submodules * Chore: Code cleanup * Fix: Use .NET 7 for CodeQL (dragablz) * Fix: CodeQL build * Docs: Add .NET 7 for Dragablz * Chore: Update Dragablz * Fix: Remove .NET 7 from workflow
1 parent 1ecda91 commit 9bbfd36

8 files changed

Lines changed: 10 additions & 12 deletions

File tree

.github/appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ branches:
44
- main
55
configuration: Release
66
platform: x64
7+
install:
8+
- git submodule update --init
79
before_build:
810
- dotnet restore .\Source\NETworkManager.sln
911
build_script:
1012
- dotnet build .\Source\NETworkManager.sln --configuration Release --no-restore
11-
#install:
12-
# - ps: Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
13-
# - ps: '& $env:temp\dotnet-install.ps1 -Architecture x64 -Version "5.0.302" -InstallDir "$env:ProgramFiles\dotnet"'

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Source/3rdparty/Dragablz"]
2+
path = Source/3rdparty/Dragablz
3+
url = https://github.com/BornToBeRoot/Dragablz

Source/3rdparty/Dragablz

Submodule Dragablz added at 6398157

Source/NETworkManager.Models/Generated Files/WinRTEventHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
3-
// This file was generated by cswinrt.exe version 2.0.0.220816.1
3+
// This file was generated by cswinrt.exe version 2.0.1.221115.1
44
//
55
// Changes to this file may cause incorrect behavior and will be lost if
66
// the code is regenerated.

Source/NETworkManager/Generated Files/WinRTEventHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
3-
// This file was generated by cswinrt.exe version 2.0.0.220816.1
3+
// This file was generated by cswinrt.exe version 2.0.1.221115.1
44
//
55
// Changes to this file may cause incorrect behavior and will be lost if
66
// the code is regenerated.

Source/NETworkManager/NETworkManager.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<PackageReference Include="AirspaceFixer" Version="1.0.6" />
4444
<PackageReference Include="AWSSDK.EC2" Version="3.7.108" />
4545
<PackageReference Include="DnsClient" Version="1.7.0" />
46-
<PackageReference Include="Dragablz" Version="0.0.3.234" />
4746
<PackageReference Include="IPNetwork2" Version="2.6.508" />
4847
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.1" />
4948
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
@@ -70,6 +69,7 @@
7069
</Content>
7170
</ItemGroup>
7271
<ItemGroup>
72+
<ProjectReference Include="..\3rdparty\Dragablz\Dragablz\Dragablz.csproj" />
7373
<ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj" />
7474
<ProjectReference Include="..\NETworkManager.Converters\NETworkManager.Converters.csproj" />
7575
<ProjectReference Include="..\NETworkManager.Documentation\NETworkManager.Documentation.csproj" />

docs/Changelog/next-release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ New Feature
2525

2626
## Bugfixes
2727

28+
- Fixed a bug in Dragablz that in certain circumstances locks the tab when you right-click on it and try to move it (See [#132](https://github.com/ButchersBoy/Dragablz/issues/132) & [#1702](https://github.com/BornToBeRoot/NETworkManager/issues/1702) for more details) [#1712](https://github.com/BornToBeRoot/NETworkManager/pull/1712){:target="\_blank"}
2829
- Lookup - OUI, Lookup
2930
- Input cannot end with ";" [#1515](https://github.com/BornToBeRoot/NETworkManager/pull/1515){:target="\_blank"}
3031

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)