Merge pull request #3 from joaoribe/upgrade-ssms20

Upgrade to SSMS 20, VS2022 and .NET Framework 4.8.1

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 { }
 

src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -21,7 +22,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SQLScriptsExplorer.Addin</RootNamespace>
     <AssemblyName>SQLScriptsExplorer.Addin</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -42,7 +43,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
-    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SQLScriptsExplorer</CopyVsixExtensionLocation>
+    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 20\Common7\IDE\Extensions\SQLScriptsExplorer</CopyVsixExtensionLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -207,7 +208,10 @@
     <PackageReference Include="Microsoft.VisualStudio.Validation">
       <Version>15.0.82</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.9.1050" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Controls\FileExplorerTreeView.xaml">

src/SQLScriptsExplorer.Addin/source.extension.vsixmanifest

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Id="SQLScriptsExplorer.Addin.b22c3965-9172-4eab-980d-a833bee345ab" Version="1.0" Language="en-US" Publisher="Joao Ribeiro Neto" />
-        <DisplayName>SQL Scripts Explorer Addin.</DisplayName>
-        <Description>Collaborate SQL Scripts between teams.</Description>
-    </Metadata>
-    <Installation AllUsers="true">
-      <InstallationTarget Id="ssms" Version="[13.0,18.0)" />
-      <InstallationTarget Version="[13.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-        <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,17.0)" />
-    </Dependencies>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
-    </Prerequisites>
-    <Assets>
-
+  <Metadata>
+    <Identity Id="SQLScriptsExplorer.Addin.b22c3965-9172-4eab-980d-a833bee345ab" Version="1.0" Language="en-US" Publisher="Joao Ribeiro Neto" />
+    <DisplayName>SQL Scripts Explorer Addin.</DisplayName>
+    <Description>Collaborate SQL Scripts between teams.</Description>
+  </Metadata>
+  <Installation AllUsers="true">
+    <InstallationTarget Id="ssms" Version="[13.0,20.0)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Version="[13.0,20.0)" Id="Microsoft.VisualStudio.IntegratedShell">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8.1,)" />
+    <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,18.0)" />
+  </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,18.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
+  <Assets>
+
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
   </Assets>
 </PackageManifest>

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