From 1d2aa45217fa7a4dd2989eec6a8cd7919229b315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ribeiro=20Neto?= Date: Thu, 12 Dec 2024 23:21:02 +0000 Subject: [PATCH 1/2] Upgrade .NET Framework, Visual Studio Solution, NuGet Packages and add Exception Handling --- .../Infrastructure/RegistryManager.cs | 7 +++- .../Properties/Resources.Designer.cs | 2 +- .../SQLScriptsExplorer.Addin.csproj | 8 +++- .../VSPackage.Designer.cs | 2 +- .../source.extension.vsixmanifest | 40 ++++++++++--------- src/SQLScriptsExplorer.sln | 4 +- 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/SQLScriptsExplorer.Addin/Infrastructure/RegistryManager.cs b/src/SQLScriptsExplorer.Addin/Infrastructure/RegistryManager.cs index 13df9f8..7e5ab71 100644 --- a/src/SQLScriptsExplorer.Addin/Infrastructure/RegistryManager.cs +++ b/src/SQLScriptsExplorer.Addin/Infrastructure/RegistryManager.cs @@ -22,7 +22,12 @@ public static string GetRegisterValue(string name) try { - value = RootRegistry.GetValue(name).ToString(); + var registryValue = RootRegistry.GetValue(name); + + if (registryValue == null) + return string.Empty; + + value = registryValue.ToString(); } catch { } diff --git a/src/SQLScriptsExplorer.Addin/Properties/Resources.Designer.cs b/src/SQLScriptsExplorer.Addin/Properties/Resources.Designer.cs index d1a3fa3..654b21c 100644 --- a/src/SQLScriptsExplorer.Addin/Properties/Resources.Designer.cs +++ b/src/SQLScriptsExplorer.Addin/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SQLScriptsExplorer.Addin.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj b/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj index a0cef47..a5f732e 100644 --- a/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj +++ b/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj @@ -3,6 +3,7 @@ 16.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + true @@ -21,7 +22,7 @@ Properties SQLScriptsExplorer.Addin SQLScriptsExplorer.Addin - v4.7.2 + v4.8.1 true true true @@ -207,7 +208,10 @@ 15.0.82 - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/src/SQLScriptsExplorer.Addin/VSPackage.Designer.cs b/src/SQLScriptsExplorer.Addin/VSPackage.Designer.cs index e690072..c368ff1 100644 --- a/src/SQLScriptsExplorer.Addin/VSPackage.Designer.cs +++ b/src/SQLScriptsExplorer.Addin/VSPackage.Designer.cs @@ -19,7 +19,7 @@ namespace SQLScriptsExplorer.Addin { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class VSPackage { diff --git a/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest b/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest index bc6aae4..54b8306 100644 --- a/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest +++ b/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest @@ -1,23 +1,27 @@  - - - SQL Scripts Explorer Addin. - Collaborate SQL Scripts between teams. - - - - - - - - - - - - - - + + + SQL Scripts Explorer Addin. + Collaborate SQL Scripts between teams. + + + + amd64 + + + amd64 + + + + + + + + + + + diff --git a/src/SQLScriptsExplorer.sln b/src/SQLScriptsExplorer.sln index 98c5886..11a3e0d 100644 --- a/src/SQLScriptsExplorer.sln +++ b/src/SQLScriptsExplorer.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31025.194 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLScriptsExplorer.Addin", "SQLScriptsExplorer.Addin\SQLScriptsExplorer.Addin.csproj", "{194CCEE9-F9B5-4681-A1BE-94B31C112D19}" EndProject From a61eabf5ad220e5befa468a559f53510ca592f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ribeiro=20Neto?= Date: Thu, 12 Dec 2024 23:30:21 +0000 Subject: [PATCH 2/2] Upgrade to SSMS 20 --- src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj | 2 +- src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj b/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj index a5f732e..d8482f9 100644 --- a/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj +++ b/src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj @@ -43,7 +43,7 @@ prompt 4 True - C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SQLScriptsExplorer + C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 20\Common7\IDE\Extensions\SQLScriptsExplorer pdbonly diff --git a/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest b/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest index 54b8306..1ce10a0 100644 --- a/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest +++ b/src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest @@ -6,10 +6,10 @@ Collaborate SQL Scripts between teams. - + amd64 - + amd64