From 9b07b47b621496c66e8daca10a1de09e66c2bf7c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 17:08:06 -0700 Subject: [PATCH 1/2] Remove additional dev11 and dev12 references from msbuild files NTVS 1.2 no longer supports VS11 or VS12. This change removes a few remaining references from the msbuild files. Also removes the c++ targets logic. --- Build/Common.Build.CSharp.settings | 27 +-------- Build/Common.Build.Cpp.settings | 93 ------------------------------ Build/Common.Build.settings | 15 +---- Build/default.12.0Exp.testsettings | 23 -------- Nodejs/Product/AssemblyVersion.cs | 4 +- 5 files changed, 5 insertions(+), 157 deletions(-) delete mode 100644 Build/Common.Build.Cpp.settings delete mode 100644 Build/default.12.0Exp.testsettings diff --git a/Build/Common.Build.CSharp.settings b/Build/Common.Build.CSharp.settings index e1786c645..a0c3b736c 100644 --- a/Build/Common.Build.CSharp.settings +++ b/Build/Common.Build.CSharp.settings @@ -29,14 +29,10 @@ true TRACE;$(DefineConstants) - - - $(DefineConstants);FEATURE_AZURE_REMOTE_DEBUG - - $(DefineConstants);DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER + $(DefineConstants);DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER 15.0.0.0 Core @@ -47,27 +43,6 @@ 14.0.0.0 Core - - - $(DefineConstants);DEV12;DEV12_OR_LATER;DEV11_OR_LATER - DEV12;DEV12_OR_LATER;DEV11_OR_LATER - 12.0.0.0 - v12.0 - - - - $(DefineConstants);DEV11;DEV11_OR_LATER - DEV11;DEV11_OR_LATER - 4.0.0.0 - v4.0 - - - - $(DefineConstants);DEV10 - DEV10 - 4.0.0.0 - v4.0 - false diff --git a/Build/Common.Build.Cpp.settings b/Build/Common.Build.Cpp.settings deleted file mode 100644 index b32ed474a..000000000 --- a/Build/Common.Build.Cpp.settings +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - - C++ - Win32 - - - - DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER;%(PreprocessorDefinitions) - - - - - - DEV14;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER;%(PreprocessorDefinitions) - - - - - - DEV12;DEV12_OR_LATER;DEV11_OR_LATER;%(PreprocessorDefinitions) - - - - - - DEV11;DEV11_OR_LATER;%(PreprocessorDefinitions) - - - - - - DEV10;%(PreprocessorDefinitions) - - - - - - Level3 - Use - $(TreatWarningsAsErrors) - - - true - - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - - - - - - - MaxSpeed - true - true - NDEBUG;%(PreprocessorDefinitions) - - - - true - true - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - WIN64;%(PreprocessorDefinitions) - - - - diff --git a/Build/Common.Build.settings b/Build/Common.Build.settings index 740d491ee..1ea5af1b5 100644 --- a/Build/Common.Build.settings +++ b/Build/Common.Build.settings @@ -25,12 +25,9 @@ true - 10.0 + 14.0 15.0 - 14.0 - 12.0 - 11.0 - 10.0 + 14.0 false v4.6 @@ -89,7 +86,6 @@ - prompt 4 @@ -116,12 +112,6 @@ $([System.Double]::Parse($(VSTarget))) <_VSUpdateVersion Condition="$(VSUpdateVersion)=='' and $(VisualStudioVersion)!='10.0'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\DevDiv\vs\Servicing\$(VSTarget)\devenv', 'UpdateVersion', null, RegistryView.Registry32)) $([System.Int32]::Parse($(_VSUpdateVersion.Substring($([MSBuild]::Add(1, $(_VSUpdateVersion.LastIndexOf(`.`)))))))) - - - $(ReleaseBuild) - - - true @@ -143,7 +133,6 @@ - diff --git a/Build/default.12.0Exp.testsettings b/Build/default.12.0Exp.testsettings deleted file mode 100644 index 71d8b96bc..000000000 --- a/Build/default.12.0Exp.testsettings +++ /dev/null @@ -1,23 +0,0 @@ - - - Local test runs with the VS 2013 Experimental Hive - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Nodejs/Product/AssemblyVersion.cs b/Nodejs/Product/AssemblyVersion.cs index 72a4814e2..3352c4a2a 100644 --- a/Nodejs/Product/AssemblyVersion.cs +++ b/Nodejs/Product/AssemblyVersion.cs @@ -39,7 +39,7 @@ class AssemblyVersionInfo { // This version should never change from "4100.00"; BuildRelease.ps1 // will replace it with a generated value. - public const string BuildNumber = "4100.00"; + public const string BuildNumber = "40809.08"; #if DEV14 public const string VSMajorVersion = "14"; const string VSVersionSuffix = "2015"; @@ -57,4 +57,4 @@ class AssemblyVersionInfo { // Defaults to "1.2.4100.00" public const string Version = FileVersion + "." + BuildNumber; -} \ No newline at end of file +} From 71dfe306027f06317f463a5e272ca53440633a65 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2016 17:10:08 -0700 Subject: [PATCH 2/2] Revert assemblyversion change --- Nodejs/Product/AssemblyVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nodejs/Product/AssemblyVersion.cs b/Nodejs/Product/AssemblyVersion.cs index 3352c4a2a..72a4814e2 100644 --- a/Nodejs/Product/AssemblyVersion.cs +++ b/Nodejs/Product/AssemblyVersion.cs @@ -39,7 +39,7 @@ class AssemblyVersionInfo { // This version should never change from "4100.00"; BuildRelease.ps1 // will replace it with a generated value. - public const string BuildNumber = "40809.08"; + public const string BuildNumber = "4100.00"; #if DEV14 public const string VSMajorVersion = "14"; const string VSVersionSuffix = "2015"; @@ -57,4 +57,4 @@ class AssemblyVersionInfo { // Defaults to "1.2.4100.00" public const string Version = FileVersion + "." + BuildNumber; -} +} \ No newline at end of file