From 481ea90efae9d246c0f2d085f235c865a5a55180 Mon Sep 17 00:00:00 2001 From: Matthew Manela Date: Tue, 10 Nov 2015 16:02:53 -0800 Subject: [PATCH] Update to VS 2015 --- Chutzpah.NoVS.sln | 4 +- Chutzpah.VS2013.sln => Chutzpah.VS.sln | 4 +- VS2012.TestAdapter/VS2012.TestAdapter.csproj | 6 +- VS2012/Resources.Designer.cs | 2 +- VS2012/VS2012.csproj | 10 +- VisualStudioContextMenu/Resources.Designer.cs | 126 +++++++++--------- .../VisualStudioContextMenu.csproj | 12 +- 7 files changed, 81 insertions(+), 83 deletions(-) rename Chutzpah.VS2013.sln => Chutzpah.VS.sln (98%) diff --git a/Chutzpah.NoVS.sln b/Chutzpah.NoVS.sln index 38cefce9..2d7f81aa 100644 --- a/Chutzpah.NoVS.sln +++ b/Chutzpah.NoVS.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 +Microsoft Visual Studio Solution File, Format Version 14.00 +# Visual Studio 2015 VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{89BF7E7C-588C-40AA-B992-906342FA526E}" diff --git a/Chutzpah.VS2013.sln b/Chutzpah.VS.sln similarity index 98% rename from Chutzpah.VS2013.sln rename to Chutzpah.VS.sln index bd60d544..2ba30dd3 100644 --- a/Chutzpah.VS2013.sln +++ b/Chutzpah.VS.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{89BF7E7C-588C-40AA-B992-906342FA526E}" EndProject diff --git a/VS2012.TestAdapter/VS2012.TestAdapter.csproj b/VS2012.TestAdapter/VS2012.TestAdapter.csproj index 89c5b012..0f013955 100644 --- a/VS2012.TestAdapter/VS2012.TestAdapter.csproj +++ b/VS2012.TestAdapter/VS2012.TestAdapter.csproj @@ -1,14 +1,14 @@  - 12.0 - 11.0 + 14.0 + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 4.0 + 12.0 diff --git a/VS2012/Resources.Designer.cs b/VS2012/Resources.Designer.cs index 2aed2bf4..18d7cb80 100644 --- a/VS2012/Resources.Designer.cs +++ b/VS2012/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34003 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/VS2012/VS2012.csproj b/VS2012/VS2012.csproj index 14a5f94b..8b216ddf 100644 --- a/VS2012/VS2012.csproj +++ b/VS2012/VS2012.csproj @@ -1,20 +1,16 @@  - 12.0 - 4.0 + 12.0 - 12.0 - 11.0 + 14.0 + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - $(VisualStudioVersionOverride) - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/VisualStudioContextMenu/Resources.Designer.cs b/VisualStudioContextMenu/Resources.Designer.cs index c07c4762..e25bc409 100644 --- a/VisualStudioContextMenu/Resources.Designer.cs +++ b/VisualStudioContextMenu/Resources.Designer.cs @@ -1,63 +1,63 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.35312 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Chutzpah.VisualStudioContextMenu { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Chutzpah.VisualStudioContextMenu.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Chutzpah.VisualStudioContextMenu { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Chutzpah.VisualStudioContextMenu.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/VisualStudioContextMenu/VisualStudioContextMenu.csproj b/VisualStudioContextMenu/VisualStudioContextMenu.csproj index c45d522e..207156ae 100644 --- a/VisualStudioContextMenu/VisualStudioContextMenu.csproj +++ b/VisualStudioContextMenu/VisualStudioContextMenu.csproj @@ -1,12 +1,14 @@  - 12.0 - 12.0 + 14.0 + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - $(VisualStudioVersionOverride) - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 12.0