From 6ae5a7222fcc54921bb256bcf33629618f4ab712 Mon Sep 17 00:00:00 2001 From: Rami Abughazaleh Date: Fri, 31 Jan 2020 16:58:50 -0800 Subject: [PATCH] Added support for Visual Studio 2017 --- .gitignore | 6 +-- VsDingExtension.sln | 8 ++- VsDingExtensionProject/Resources.Designer.cs | 4 +- .../VsDingExtensionProject.csproj | 35 +++---------- .../VsDingExtensionProjectPackage.cs | 2 +- VsDingExtensionProject/packages.config | 3 -- .../source.extension.vsixmanifest | 49 ++++++++++--------- 7 files changed, 46 insertions(+), 61 deletions(-) delete mode 100644 VsDingExtensionProject/packages.config diff --git a/.gitignore b/.gitignore index cc9aa5c..6afa01d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ## files generated by popular Visual Studio add-ons. # User-specific files +.vs *.suo *.user *.sln.docstates @@ -96,8 +97,7 @@ publish/ *.Publish.xml # NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ +packages/ # Windows Azure Build Output csx @@ -155,4 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store /VsDingExtensionProject/pingme.txt -/VsDingExtensionProject/*.csdat +/VsDingExtensionProject/*.csdat \ No newline at end of file diff --git a/VsDingExtension.sln b/VsDingExtension.sln index e6aab38..e6bbc9d 100644 --- a/VsDingExtension.sln +++ b/VsDingExtension.sln @@ -1,10 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1000 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5BD9D4DB-8683-4698-8D24-01EE7306F73A}" ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore IntegrationTests.testsettings = IntegrationTests.testsettings README.md = README.md UnitTests.testsettings = UnitTests.testsettings @@ -38,4 +39,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {67E74652-1BD7-4921-A30B-C6EF77118595} + EndGlobalSection EndGlobal diff --git a/VsDingExtensionProject/Resources.Designer.cs b/VsDingExtensionProject/Resources.Designer.cs index 45d43ae..057d8e8 100644 --- a/VsDingExtensionProject/Resources.Designer.cs +++ b/VsDingExtensionProject/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace VitaliiGanzha.VsDingExtension { // 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", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/VsDingExtensionProject/VsDingExtensionProject.csproj b/VsDingExtensionProject/VsDingExtensionProject.csproj index 475afb6..24403dd 100644 --- a/VsDingExtensionProject/VsDingExtensionProject.csproj +++ b/VsDingExtensionProject/VsDingExtensionProject.csproj @@ -1,13 +1,18 @@  - 12.0 + 15.0 12.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) Program $(DevEnvDir)\devenv.exe /rootsuffix Exp + + + + + 12.0 speaker.ico @@ -25,7 +30,7 @@ VsDingExtension True Key.snk - v4.5 + v4.6 true @@ -51,6 +56,7 @@ + @@ -76,21 +82,6 @@ - - ..\packages\Microsoft.Composition.1.0.20\lib\portable-net45+win8\System.Composition.AttributedModel.dll - - - ..\packages\Microsoft.Composition.1.0.20\lib\portable-net45+win8\System.Composition.Convention.dll - - - ..\packages\Microsoft.Composition.1.0.20\lib\portable-net45+win8\System.Composition.Hosting.dll - - - ..\packages\Microsoft.Composition.1.0.20\lib\portable-net45+win8\System.Composition.Runtime.dll - - - ..\packages\Microsoft.Composition.1.0.20\lib\portable-net45+win8\System.Composition.TypedParts.dll - @@ -108,15 +99,6 @@ False False - - {26AD1324-4B7C-44BC-84F8-B86AED45729F} - 10 - 0 - 0 - primary - False - False - {1A31287A-4D7D-413E-8E32-3B374931BD89} 8 @@ -206,7 +188,6 @@ - Designer diff --git a/VsDingExtensionProject/VsDingExtensionProjectPackage.cs b/VsDingExtensionProject/VsDingExtensionProjectPackage.cs index bdca97d..45c21a4 100644 --- a/VsDingExtensionProject/VsDingExtensionProjectPackage.cs +++ b/VsDingExtensionProject/VsDingExtensionProjectPackage.cs @@ -18,7 +18,7 @@ namespace VitaliiGanzha.VsDingExtension [Guid(GuidList.guidVsDingExtensionProjectPkgString)] [ProvideAutoLoad("{f1536ef8-92ec-443c-9ed7-fdadf150da82}")] [ProvideOptionPage(typeof(OptionsDialog), "Ding", "General settings", 0, 0, true)] - [ProvideOptionPage(typeof(SoundsSelectOptionsPage), "Ding", "Overrride sounds", 0, 0, true)] + [ProvideOptionPage(typeof(SoundsSelectOptionsPage), "Ding", "Override sounds", 0, 0, true)] public sealed class VsDingExtensionProjectPackage : Package, IDisposable { private DTE2 applicationObject; diff --git a/VsDingExtensionProject/packages.config b/VsDingExtensionProject/packages.config deleted file mode 100644 index 6b8deb9..0000000 --- a/VsDingExtensionProject/packages.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/VsDingExtensionProject/source.extension.vsixmanifest b/VsDingExtensionProject/source.extension.vsixmanifest index e96e8a3..62f47d6 100644 --- a/VsDingExtensionProject/source.extension.vsixmanifest +++ b/VsDingExtensionProject/source.extension.vsixmanifest @@ -1,9 +1,9 @@  - - - Visual Studio Ding extension - This small extension will play notification sounds when following events occur: + + + Visual Studio Ding extension + This small extension will play notification sounds when following events occur: - Build Complete - Entering debugger mode (breakpoint hit, etc) - Unit tests finished to run @@ -15,23 +15,26 @@ Just install it and it is ready to use! This is an open source project, join! Twitter: @GanzhaVitalii - https://github.com/thecoderok/vsdingextension - ReleaseNotes.txt - speaker.ico - productivity - - - - - - - - - - - - - - - + https://github.com/thecoderok/vsdingextension + ReleaseNotes.txt + speaker.ico + productivity + + + + + + + + + + + + + + + + + +