Skip to content

Commit dbd05c6

Browse files
committed
Update
Moved services under UI app
1 parent 08a2315 commit dbd05c6

29 files changed

Lines changed: 41402 additions & 133 deletions

AppSetup/AppSetup.vdproj

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
"PrivateKeyFile" = "8:"
3232
"TimeStampServer" = "8:"
3333
"InstallerBootstrapper" = "3:2"
34+
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
35+
{
36+
"Enabled" = "11:TRUE"
37+
"PromptEnabled" = "11:TRUE"
38+
"PrerequisitesLocation" = "2:1"
39+
"Url" = "8:"
40+
"ComponentsUrl" = "8:"
41+
}
3442
}
3543
"Release"
3644
{
@@ -47,6 +55,14 @@
4755
"PrivateKeyFile" = "8:"
4856
"TimeStampServer" = "8:"
4957
"InstallerBootstrapper" = "3:2"
58+
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
59+
{
60+
"Enabled" = "11:TRUE"
61+
"PromptEnabled" = "11:TRUE"
62+
"PrerequisitesLocation" = "2:1"
63+
"Url" = "8:"
64+
"ComponentsUrl" = "8:"
65+
}
5066
}
5167
}
5268
"Deployable"
@@ -64,6 +80,16 @@
6480
{
6581
"LaunchCondition"
6682
{
83+
"{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_805C87297A1A46A5BE2B2CA966655AEA"
84+
{
85+
"Name" = "8:.NET Core"
86+
"Message" = "8:[VSDNETCOREMSG]"
87+
"AllowLaterVersions" = "11:FALSE"
88+
"InstallUrl" = "8:https://dotnet.microsoft.com/download/dotnet-core/[NetCoreVerMajorDotMinor]"
89+
"IsNETCore" = "11:TRUE"
90+
"Architecture" = "2:0"
91+
"Runtime" = "2:0"
92+
}
6793
}
6894
}
6995
"File"
@@ -646,7 +672,7 @@
646672
{
647673
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_50DCDD46CDE64D3ABD90C82476B4F785"
648674
{
649-
"SourcePath" = "8:"
675+
"SourcePath" = "8:..\\SqlMonitorUI\\obj\\Debug\\net8.0-windows\\apphost.exe"
650676
"TargetName" = "8:"
651677
"Tag" = "8:"
652678
"Folder" = "8:_795559F85A644E39A164DF63546CAE9C"
@@ -672,34 +698,6 @@
672698
{
673699
}
674700
}
675-
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E49ED5A4B3984A1FAC63D77D7F5704C9"
676-
{
677-
"SourcePath" = "8:"
678-
"TargetName" = "8:"
679-
"Tag" = "8:"
680-
"Folder" = "8:_795559F85A644E39A164DF63546CAE9C"
681-
"Condition" = "8:"
682-
"Transitive" = "11:FALSE"
683-
"Vital" = "11:TRUE"
684-
"ReadOnly" = "11:FALSE"
685-
"Hidden" = "11:FALSE"
686-
"System" = "11:FALSE"
687-
"Permanent" = "11:FALSE"
688-
"SharedLegacy" = "11:FALSE"
689-
"PackageAs" = "3:1"
690-
"Register" = "3:1"
691-
"Exclude" = "11:FALSE"
692-
"IsDependency" = "11:FALSE"
693-
"IsolateTo" = "8:"
694-
"ProjectOutputGroupRegister" = "3:1"
695-
"OutputConfiguration" = "8:"
696-
"OutputGroupCanonicalName" = "8:PublishItems"
697-
"OutputProjectGuid" = "8:{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
698-
"ShowKeyOutput" = "11:TRUE"
699-
"ExcludeFilters"
700-
{
701-
}
702-
}
703701
}
704702
}
705703
}

SQLDBA.ORG.sp_triage.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* بسم الله الرحمن الرحيم */
22
/* In the name of God, the Merciful, the Compassionate */
3-
3+
IF OBJECT_ID('dbo.[sp_triage®]') IS NULL
4+
EXEC ('CREATE PROCEDURE dbo.[sp_triage®] AS RETURN 0;');
5+
GO
46
ALTER PROCEDURE [dbo].[sp_triage®] --@Debug = 0]
57
--DECLARE
68
/*

SQLMonitoring.7z

-3.14 MB
Binary file not shown.

SQLMonitoring.zip

-9.39 MB
Binary file not shown.

SQLMonitoringv21.zip

-78.1 KB
Binary file not shown.

SqlCheckLibrary/SqlCheckLibrary.csproj

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

SqlCheckLibrary/app.ico

-32.4 KB
Binary file not shown.

SqlHealthCheck.sln

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.0.31903.59
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCheckLibrary", "SqlCheckLibrary\SqlCheckLibrary.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
6-
EndProject
75
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlMonitorUI", "SqlMonitorUI\SqlMonitorUI.csproj", "{C3D4E5F6-7890-ABCD-EF12-34567890ABCD}"
86
EndProject
9-
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "AppSetup", "AppSetup\AppSetup.vdproj", "{F5938B1F-6A3D-3DB7-9FCC-1BB0A2D362F9}"
7+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install SQLDBA SQL Monitor", "AppSetup\AppSetup.vdproj", "{F5938B1F-6A3D-3DB7-9FCC-1BB0A2D362F9}"
108
EndProject
119
Global
1210
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1311
Debug|Any CPU = Debug|Any CPU
1412
Release|Any CPU = Release|Any CPU
1513
EndGlobalSection
1614
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17-
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18-
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
19-
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
20-
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
2115
{C3D4E5F6-7890-ABCD-EF12-34567890ABCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2216
{C3D4E5F6-7890-ABCD-EF12-34567890ABCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
2317
{C3D4E5F6-7890-ABCD-EF12-34567890ABCD}.Release|Any CPU.ActiveCfg = Release|Any CPU

SqlMonitorUI/LiveMonitoringWindow.xaml.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
using System.Windows.Controls;
1818
using System.Windows.Controls.Primitives;
1919
using System.Windows.Documents;
20-
using System.Windows.Forms;
20+
//using System.Windows.Forms;
2121
using System.Windows.Media;
2222
using System.Windows.Shapes;
2323
using System.Windows.Threading;
2424
using static System.Net.Mime.MediaTypeNames;
25-
using static System.Windows.Forms.AxHost;
25+
//using static System.Windows.Forms.AxHost;
2626
//using static System.Windows.Forms.VisualStyles.VisualStyleElement;
2727
//using static System.Windows.Forms.VisualStyles.VisualStyleElement;
2828

@@ -1482,7 +1482,9 @@ private void UpdateSessions(List<SessionItem> sess)
14821482
_spidHistories[s.Spid].LastCpu = s.Cpu;
14831483
_spidHistories[s.Spid].LastIo = s.PhysicalIo;
14841484
}
1485-
var active = sess.Select(x => x.Spid).ToHashSet();
1485+
//net48 var active = sess.Select(x => x.Spid).ToHashSet();
1486+
// To this:
1487+
var active = new HashSet<int>(sess.Select(x => x.Spid));
14861488
foreach (var h in _spidHistories.Values) if (!active.Contains(h.Spid)) { h.IsActive = false; h.AddSample(0, 0); }
14871489
SessionsGrid.ItemsSource = sess;
14881490
SessionCountText.Text = $" ({sess.Count})";
@@ -1792,9 +1794,11 @@ private void UpdateSpidBoxes()
17921794
_spidBoxPositions.Clear();
17931795
_spidBoxBorders.Clear();
17941796

1795-
var blockerSpids = _currentBlocking.Select(b => b.BlockerSpid).ToHashSet();
1796-
var waitSpids = _currentBlocking.Select(b => b.WaitSpid).ToHashSet();
1797-
1797+
//net48 var blockerSpids = _currentBlocking.Select(b => b.BlockerSpid).ToHashSet();
1798+
//net48 var waitSpids = _currentBlocking.Select(b => b.WaitSpid).ToHashSet();
1799+
var blockerSpids = new HashSet<int>(_currentBlocking.Select(b => b.BlockerSpid));
1800+
var waitSpids = new HashSet<int>(_currentBlocking.Select(b => b.WaitSpid));
1801+
17981802
// Use virtualization or pagination for large datasets
17991803
//var visibleData = spidData.Take(1000); // Limit to prevent UI lag
18001804

0 commit comments

Comments
 (0)