Verified Visual Studio 2019 support

NKnusperer · Mar 3, 2021 · 5c56694 · 5c56694
1 parent f18ac16
commit 5c56694
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 53 deletions.
diff --git a/BetterConfigurationManager.csproj b/BetterConfigurationManager.csproj
@@ -21,7 +21,7 @@
     <AssemblyName>BetterConfigurationManager</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -7,6 +7,6 @@
 [assembly: AssemblyCopyright("Copyright © Hendrik Müller 2015")]
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
-[assembly: AssemblyVersion("1.2.0")]
-[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyVersion("1.3.0")]
+[assembly: AssemblyFileVersion("1.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Tests/BetterConfigurationManager.Tests.csproj b/Tests/BetterConfigurationManager.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BetterConfigurationManager.Tests</RootNamespace>
     <AssemblyName>BetterConfigurationManager.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +67,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.6.1" targetFramework="net462" />
+  <package id="NUnit" version="3.13.1" targetFramework="net48" />
+  <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net48" />
 </packages>
diff --git a/packages.config b/packages.config
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EnvDTE" version="8.0.1" targetFramework="net46" />
-  <package id="EnvDTE80" version="8.0.1" targetFramework="net46" />
-  <package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net462" developmentDependency="true" />
-  <package id="stdole" version="7.0.3301" targetFramework="net46" />
-  <package id="VSSDK.DTE" version="7.0.4" targetFramework="net46" />
-  <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net46" />
-  <package id="VSSDK.IDE" version="7.0.4" targetFramework="net46" />
-  <package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net46" />
-  <package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net46" />
-  <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net46" />
-  <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net46" />
-  <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.11" version="11.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net46" />
-  <package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net46" />
-  <package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net46" />
-  <package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net46" />
+  <package id="EnvDTE" version="8.0.1" targetFramework="net48" />
+  <package id="EnvDTE80" version="8.0.1" targetFramework="net48" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net48" developmentDependency="true" />
+  <package id="stdole" version="7.0.3301" targetFramework="net48" />
+  <package id="VSSDK.DTE" version="7.0.4" targetFramework="net48" />
+  <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net48" />
+  <package id="VSSDK.IDE" version="7.0.4" targetFramework="net48" />
+  <package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net48" />
+  <package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net48" />
+  <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net48" />
+  <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net48" />
+  <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.11" version="11.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net48" />
+  <package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net48" />
+  <package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net48" />
+  <package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net48" />
 </packages>
diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
@@ -1,28 +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="f2e704b7-483a-41ee-9b77-c68e6ebe5cf5" Version="1.2" Language="en-US" Publisher="Hendrik Müller" />
-        <DisplayName>Better Configuration Manager</DisplayName>
-        <Description xml:space="preserve">The Configuration Manager you always wanted since 2003.</Description>
-        <MoreInfo>https://github.com/NKnusperer/BetterConfigurationManager</MoreInfo>
-        <License>Resources\EuropeanUnionPublicLicence.rtf</License>
-        <ReleaseNotes>https://github.com/NKnusperer/BetterConfigurationManager/releases</ReleaseNotes>
-        <Icon>Resources\Package.ico</Icon>
-        <Tags>configuration manager</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
-        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
-        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
-    </Installation>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[11.0,17.0)" DisplayName="Visual Studio core editor" />
-    </Prerequisites>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
-        <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[11.0,17.0)" />
-    </Dependencies>
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-    </Assets>
-</PackageManifest>
+	<Metadata>
+		<Identity Id="f2e704b7-483a-41ee-9b77-c68e6ebe5cf5" Version="1.3" Language="en-US" Publisher="Hendrik Müller" />
+		<DisplayName>Better Configuration Manager</DisplayName>
+		<Description xml:space="preserve">The Configuration Manager you always wanted since 2003.</Description>
+		<MoreInfo>https://github.com/NKnusperer/BetterConfigurationManager</MoreInfo>
+		<License>Resources\EuropeanUnionPublicLicence.rtf</License>
+		<ReleaseNotes>https://github.com/NKnusperer/BetterConfigurationManager/releases</ReleaseNotes>
+		<Icon>Resources\Package.ico</Icon>
+		<Tags>configuration manager</Tags>
+	</Metadata>
+	<Installation>
+		<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)" />
+		<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)" />
+		<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0)" />
+	</Installation>
+	<Prerequisites>
+		<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[11.0,)" DisplayName="Visual Studio core editor" />
+	</Prerequisites>
+	<Dependencies>
+		<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
+	</Dependencies>
+	<Assets>
+		<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+	</Assets>
+</PackageManifest>