Skip to content

Commit 5bcaaa1

Browse files
authored
Merge pull request #3 from joaoribe/upgrade-ssms20
Upgrade to SSMS 20, VS2022 and .NET Framework 4.8.1
2 parents 8cde791 + a61eabf commit 5bcaaa1

File tree

6 files changed

+39
-26
lines changed

6 files changed

+39
-26
lines changed

src/SQLScriptsExplorer.Addin/Infrastructure/RegistryManager.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ public static string GetRegisterValue(string name)
2222

2323
try
2424
{
25-
value = RootRegistry.GetValue(name).ToString();
25+
var registryValue = RootRegistry.GetValue(name);
26+
27+
if (registryValue == null)
28+
return string.Empty;
29+
30+
value = registryValue.ToString();
2631
}
2732
catch { }
2833

src/SQLScriptsExplorer.Addin/Properties/Resources.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
<TargetFrameworkProfile />
67
</PropertyGroup>
78
<PropertyGroup>
89
<SignAssembly>true</SignAssembly>
@@ -21,7 +22,7 @@
2122
<AppDesignerFolder>Properties</AppDesignerFolder>
2223
<RootNamespace>SQLScriptsExplorer.Addin</RootNamespace>
2324
<AssemblyName>SQLScriptsExplorer.Addin</AssemblyName>
24-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
25+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
2526
<GeneratePkgDefFile>true</GeneratePkgDefFile>
2627
<UseCodebase>true</UseCodebase>
2728
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -42,7 +43,7 @@
4243
<ErrorReport>prompt</ErrorReport>
4344
<WarningLevel>4</WarningLevel>
4445
<CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
45-
<CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SQLScriptsExplorer</CopyVsixExtensionLocation>
46+
<CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 20\Common7\IDE\Extensions\SQLScriptsExplorer</CopyVsixExtensionLocation>
4647
</PropertyGroup>
4748
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4849
<DebugType>pdbonly</DebugType>
@@ -207,7 +208,10 @@
207208
<PackageReference Include="Microsoft.VisualStudio.Validation">
208209
<Version>15.0.82</Version>
209210
</PackageReference>
210-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.9.1050" />
211+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069">
212+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
213+
<PrivateAssets>all</PrivateAssets>
214+
</PackageReference>
211215
</ItemGroup>
212216
<ItemGroup>
213217
<Page Include="Controls\FileExplorerTreeView.xaml">

src/SQLScriptsExplorer.Addin/VSPackage.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
3-
<Metadata>
4-
<Identity Id="SQLScriptsExplorer.Addin.b22c3965-9172-4eab-980d-a833bee345ab" Version="1.0" Language="en-US" Publisher="Joao Ribeiro Neto" />
5-
<DisplayName>SQL Scripts Explorer Addin.</DisplayName>
6-
<Description>Collaborate SQL Scripts between teams.</Description>
7-
</Metadata>
8-
<Installation AllUsers="true">
9-
<InstallationTarget Id="ssms" Version="[13.0,18.0)" />
10-
<InstallationTarget Version="[13.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
11-
</Installation>
12-
<Dependencies>
13-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
14-
<Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,17.0)" />
15-
</Dependencies>
16-
<Prerequisites>
17-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
18-
</Prerequisites>
19-
<Assets>
20-
3+
<Metadata>
4+
<Identity Id="SQLScriptsExplorer.Addin.b22c3965-9172-4eab-980d-a833bee345ab" Version="1.0" Language="en-US" Publisher="Joao Ribeiro Neto" />
5+
<DisplayName>SQL Scripts Explorer Addin.</DisplayName>
6+
<Description>Collaborate SQL Scripts between teams.</Description>
7+
</Metadata>
8+
<Installation AllUsers="true">
9+
<InstallationTarget Id="ssms" Version="[13.0,20.0)">
10+
<ProductArchitecture>amd64</ProductArchitecture>
11+
</InstallationTarget>
12+
<InstallationTarget Version="[13.0,20.0)" Id="Microsoft.VisualStudio.IntegratedShell">
13+
<ProductArchitecture>amd64</ProductArchitecture>
14+
</InstallationTarget>
15+
</Installation>
16+
<Dependencies>
17+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8.1,)" />
18+
<Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,18.0)" />
19+
</Dependencies>
20+
<Prerequisites>
21+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,18.0)" DisplayName="Visual Studio core editor" />
22+
</Prerequisites>
23+
<Assets>
24+
2125
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2226
</Assets>
2327
</PackageManifest>

src/SQLScriptsExplorer.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.31025.194
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLScriptsExplorer.Addin", "SQLScriptsExplorer.Addin\SQLScriptsExplorer.Addin.csproj", "{194CCEE9-F9B5-4681-A1BE-94B31C112D19}"
77
EndProject

0 commit comments

Comments
 (0)