Remove dev14 references in source code

.nuget/packages.config

@@ -3,14 +3,12 @@
   <package id="ILMerge" version="2.14.1208" targetFramework="net45" />
   <package id="Microsoft.Build" version="15.1.262-preview5" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Composition" version="15.8.98" targetFramework="net45" />
-  <package id="Microsoft.VisualStudio.ProjectSystem" version="14.1.127-pre" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.ProjectSystem" version="15.0.582-pre-g76aab6d79c" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.ProjectSystem" version="16.0.201-pre-g7d366164d0" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.1.142-preview4-29265" targetFramework="net35" />
   <package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.25407" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" version="15.0.26201" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26612" targetFramework="net45" />
-  <package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net45" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net40" />

build/build.proj

@@ -220,13 +220,6 @@
              Targets="Clean"
              Properties="$(CommonMSBuildProperties);
                          VisualStudioVersion=15.0;" />
-
-    <!-- Clean 14 -->
-    <MSBuild BuildInParallel="true"
-             Projects="@(SolutionProjects)"
-             Targets="Clean"
-             Properties="$(CommonMSBuildProperties);
-                         VisualStudioVersion=14.0;" />
   </Target>
 
   <!--

build/common.project.props

@@ -86,15 +86,7 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'">
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <DefineConstants>$(DefineConstants);VS14</DefineConstants>
-    <VSSDKRoot>$(RepositoryRootDirectory)packages\Microsoft.VSSDK.BuildTools.14.3.25420</VSSDKRoot>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(VSSDKRoot)\tools</VSToolsPath>
-    <VsixOutputDirName>VS14</VsixOutputDirName>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'">
+  <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <DefineConstants>$(DefineConstants);VS15</DefineConstants>
     <VSSDKRoot>$(RepositoryRootDirectory)packages\Microsoft.VSSDK.BuildTools.15.1.192</VSSDKRoot>
@@ -148,8 +140,6 @@
   <!-- Set the output location for all non-test projects -->
   <!-- Test projects currently fail when the output dir is moved -->
   <PropertyGroup Condition=" '$(TestProject)' != 'true' OR '$(Shipping)' == 'true'">
-    <!-- Create different folders for 14.0, 15.0, 15.0-RTM -->
-
     <!-- output paths -->
     <BaseIntermediateOutputPath>$(ArtifactsDirectory)$(MSBuildProjectName)\$(BuildVariationFolder)\obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>

build/common.ps1

@@ -14,7 +14,6 @@ $Artifacts = Join-Path $NuGetClientRoot artifacts
 $Nupkgs = Join-Path $Artifacts nupkgs
 $ReleaseNupkgs = Join-Path $Artifacts ReleaseNupkgs
 $ConfigureJson = Join-Path $Artifacts configure.json
-$ILMergeOutputDir = Join-Path $Artifacts "VS14"
 
 $DotNetExe = Join-Path $CLIRoot 'dotnet.exe'
 $NuGetExe = Join-Path $NuGetClientRoot '.nuget\nuget.exe'
@@ -271,7 +270,7 @@ Function Install-DotnetCLIToILMergePack {
 
 Function Get-MSBuildRoot {
     param(
-        [ValidateSet(14,15)]
+        [ValidateSet(15)]
         [int]$MSBuildVersion,
         [switch]$Default
     )
@@ -336,7 +335,6 @@ Function Test-BuildEnvironment {
     Set-Alias msbuild $script:MSBuildExe -Scope Script -Force
     Set-Variable BuildToolsets -Value $ConfigureObject.Toolsets -Scope Script -Force
 
-    $script:VS14Installed = ($BuildToolsets | where vs14 -ne $null)
     $script:VS15Installed = ($BuildToolsets | where vs15 -ne $null)
 
     $ConfigureObject |
@@ -593,7 +591,7 @@ Function Publish-ClientsPackages {
         [string]$Configuration = $DefaultConfiguration,
         [string]$ReleaseLabel = $DefaultReleaseLabel,
         [int]$BuildNumber = (Get-BuildNumber),
-        [ValidateSet(14,15)]
+        [ValidateSet(15)]
         [int]$ToolsetVersion = $DefaultMSBuildVersion,
         [string]$KeyFile,
         [switch]$CI

build/common.targets

@@ -54,15 +54,6 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
-  <!-- These are needed because currently a VSIX project cannot reference a net core project that multi targets.
-  This is a hack for building VS14 VSIX. It's because all these targets are available in the inner build, while the VSIX project 
-  is non netcore, and isn't aware of inner/outer builds. -->
-  <Target Name="BuiltProjectOutputGroupDependencies" Condition=" '$(IsNetCoreProject)' == 'true' AND '$(VisualStudioVersion)' == '14.0' " />
-  <Target Name="BuiltProjectOutputGroup" Condition=" '$(IsNetCoreProject)' == 'true' AND '$(VisualStudioVersion)' == '14.0'" />
-  <Target Name="GetCopyToOutputDirectoryItems" Condition=" '$(IsNetCoreProject)' == 'true' AND '$(VisualStudioVersion)' == '14.0'" />
-  <Target Name="SatelliteDllsProjectOutputGroup" Condition=" '$(IsNetCoreProject)' == 'true' AND '$(VisualStudioVersion)' == '14.0'" />
-  <Target Name="DebugSymbolsProjectOutputGroup" Condition=" '$(IsNetCoreProject)' == 'true' AND '$(VisualStudioVersion)' == '14.0'" />
-
   <!--
     ============================================================
     TestProject

configure.ps1

@@ -137,14 +137,6 @@ if (-not $ProgramFiles -or -not (Test-Path $ProgramFiles)) {
 $MSBuildDefaultRoot = Join-Path $ProgramFiles MSBuild
 $MSBuildRelativePath = 'bin\msbuild.exe'
 
-Invoke-BuildStep 'Validating VS14 toolset installation' {
-    $vs14 = New-BuildToolset 14
-    if ($vs14) {
-        $ConfigureObject.Toolsets.Add('vs14', $vs14)
-        $script:MSBuildExe = Join-Path $MSBuildDefaultRoot "14.0\${MSBuildRelativePath}"
-    }
-} -ev +BuildErrors
-
 Invoke-BuildStep 'Validating VS15 toolset installation' {
     $vs15 = New-BuildToolset 15
     if ($vs15) {

runTests.ps1

@@ -14,9 +14,6 @@ Build number to use for package and assemblies versioning (auto-generated if not
 .PARAMETER SkipCore
 Skips running NuGet.Core.Tests and NuGet.Core.FuncTests
 
-.PARAMETER SkipVS14
-Skips running NuGet.Clients.Tests and NuGet.Clients.FuncTests with VS14 toolset
-
 .PARAMETER SkipVS15
 Skips running NuGet.Clients.Tests and NuGet.Clients.FuncTests with VS15 toolset
 
@@ -52,8 +49,6 @@ param (
     [switch]$SkipBuild,
     [Alias('sc')]
     [switch]$SkipCore,
-    [Alias('s14')]
-    [switch]$SkipVS14,
     [Alias('s15')]
     [switch]$SkipVS15,
     [switch]$CI
@@ -85,11 +80,6 @@ Trace-Log "Test suite run #$BuildNumber started at $startTime"
 Test-BuildEnvironment -CI:$CI
 
 # Adjust version skipping if only one version installed - if VS15 is not installed, no need to specify SkipVS15
-if (-not $SkipVS14 -and -not $VS14Installed) {
-    Warning-Log "VS14 build is requested but it appears not to be installed."
-    $SkipVS14 = $True
-}
-
 if (-not $SkipVS15 -and -not $VS15Installed) {
     Warning-Log "VS15 build is requested but it appears not to be installed."
     $SkipVS15 = $True

scripts/e2etests/InstallNuGetVSIX.ps1

@@ -8,7 +8,7 @@ param (
     [Parameter(Mandatory = $true)]
     [int]$ProcessExitTimeoutInSeconds,
     [Parameter(Mandatory = $true)]
-    [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+    [ValidateSet("15.0")]
     [string]$VSVersion)
 
 . "$PSScriptRoot\VSUtils.ps1"
@@ -28,16 +28,8 @@ $VSIXPath = Join-Path $FuncTestRoot 'NuGet.Tools.vsix'
 
 Copy-Item $VSIXSrcPath $VSIXPath
 
-# Since dev14 vsix is not uild with vssdk 3.0, we can uninstall and re installing
 # For dev 15, we upgrade an installed system component vsix
-if ($VSVersion -eq '14.0') {
-    KillRunningInstancesOfVS
-    $success = UninstallVSIX $NuGetVSIXID $VSVersion $ProcessExitTimeoutInSeconds
-    if ($success -eq $false) {
-        exit 1
-    }
-}
-else {
+if ($VSVersion -eq '15.0') {
     $numberOfTries = 0
     $success = $false
     do {

scripts/e2etests/RunFunctionalTests.ps1

@@ -12,7 +12,7 @@ param (
     [Parameter(Mandatory=$true)]
     [string]$RunCounter,
     [Parameter(Mandatory=$true)]
-	[ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+	[ValidateSet("15.0")]
     [string]$VSVersion)
 
 trap

scripts/e2etests/SetupFunctionalTests.ps1

@@ -1,6 +1,6 @@
 param (
-    [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
-    [string]$VSVersion = "14.0")
+    [ValidateSet("15.0")]
+    [string]$VSVersion = "15.0")
 
  . "$PSScriptRoot\Utils.ps1"
 

scripts/e2etests/VSUtils.ps1

@@ -5,7 +5,7 @@ $VSInstallerProcessName = "VSIXInstaller"
 function GetVSFolderPath {
     param(
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion
     )
 
@@ -37,7 +37,7 @@ function LaunchVSAndWaitForDTE {
     param (
         [string]$ActivityLogFullPath,
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion,
         [Parameter(Mandatory = $true)]
         $DTEReadyPollFrequencyInSecs,
@@ -77,7 +77,7 @@ function LaunchVSAndWaitForDTE {
 function GetVSIDEFolderPath {
     param(
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion
     )
 
@@ -105,7 +105,7 @@ function KillRunningInstancesOfVS {
 function LaunchVS {
     param(
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion,
         [string]$ActivityLogFullPath
     )
@@ -124,7 +124,7 @@ function LaunchVS {
 function GetDTE2 {
     param(
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion
     )
 
@@ -186,7 +186,7 @@ function ExecuteCommand {
 function GetVSIXInstallerPath {
     param(
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion
     )
 
@@ -209,7 +209,7 @@ function UninstallVSIX {
         [Parameter(Mandatory = $true)]
         [string]$vsixID,
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion,
         [Parameter(Mandatory = $true)]
         [int]$ProcessExitTimeoutInSeconds
@@ -278,7 +278,7 @@ function InstallVSIX {
         [Parameter(Mandatory = $true)]
         [string]$vsixpath,
         [Parameter(Mandatory = $true)]
-        [ValidateSet("15.0", "14.0", "12.0", "11.0", "10.0")]
+        [ValidateSet("15.0")]
         [string]$VSVersion,
         [Parameter(Mandatory = $true)]
         [int]$ProcessExitTimeoutInSeconds

src/NuGet.Clients/NuGet.CommandLine/Common/MSBuildUser.cs

@@ -22,7 +22,7 @@ public abstract class MSBuildUser
 
         protected string _msbuildDirectory;
 
-        // msbuildDirectory is the directory containing the msbuild to be used. E.g. C:\Program Files (x86)\MSBuild\14.0\Bin
+        // msbuildDirectory is the directory containing the msbuild to be used. E.g. C:\Program Files (x86)\MSBuild\15.0\Bin
         public void LoadAssemblies(string msbuildDirectory)
         {
             if (String.IsNullOrEmpty(msbuildDirectory))

src/NuGet.Clients/NuGet.PackageManagement.UI/Actions/UIActionEngine.cs

@@ -451,10 +451,6 @@ await _lockService.ExecuteNuGetOperationAsync(async () =>
 
         private async Task<bool> CheckPackageManagementFormat(INuGetUI uiService, CancellationToken token)
         {
-#if VS14
-            // don't show this dialog for VS 2015
-            return await Task.FromResult(true);
-#else
             var potentialProjects = new List<NuGetProject>();
 
             // check if project suppports <PackageReference> items.
@@ -508,7 +504,6 @@ private async Task<bool> CheckPackageManagementFormat(INuGetUI uiService, Cancel
             }
 
             return true;
-#endif
         }
 
         // Returns false if user doesn't accept license agreements.

src/NuGet.Clients/NuGet.PackageManagement.UI/Options/GeneralOptionControl.cs

@@ -53,12 +53,11 @@ internal void OnActivated()
 
                     var bindingRedirects = new BindingRedirectBehavior(_settings);
                     skipBindingRedirects.Checked = bindingRedirects.IsSkipped;
-#if !VS14
+
                     // package management format selection
                     var packageManagement = new PackageManagementFormat(_settings);
                     defaultPackageManagementFormatItems.SelectedIndex = packageManagement.SelectedPackageManagementFormat;
                     showPackageManagementChooser.Checked = packageManagement.Enabled;
-#endif
                 }
                 // Thrown during creating or saving NuGet.Config.
                 catch (NuGetConfigurationException ex)
@@ -95,13 +94,12 @@ internal bool OnApply()
 
                 var bindingRedirects = new BindingRedirectBehavior(_settings);
                 bindingRedirects.IsSkipped = skipBindingRedirects.Checked;
-#if !VS14
+
                 // package management format selection
                 var packageManagement = new PackageManagementFormat(_settings);
                 packageManagement.SelectedPackageManagementFormat = defaultPackageManagementFormatItems.SelectedIndex;
                 packageManagement.Enabled = showPackageManagementChooser.Checked;
                 packageManagement.ApplyChanges();
-#endif
             }
             // Thrown during creating or saving NuGet.Config.
             catch (NuGetConfigurationException ex)

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Handlers/ProjectRetargetingHandler.cs

@@ -192,13 +192,12 @@ int IVsTrackProjectRetargetingEvents.OnRetargetingAfterChange(string projRef, IV
 #pragma warning restore CS4014
                 }
             });
-#if !VS14
+
             if (retargetedProject is LegacyPackageReferenceProject)
             {
                 // trigger solution restore and don't wait for it to be complete and hold the UI thread
                 System.Threading.Tasks.Task.Run(() => _solutionRestoreWorker.Value.ScheduleRestoreAsync(SolutionRestoreRequest.ByMenu(), CancellationToken.None));
             }
-#endif
             return VSConstants.S_OK;
         }
 
@@ -297,13 +296,13 @@ int IVsTrackBatchRetargetingEvents.OnBatchRetargetingEnd()
                     _platformRetargetingProject = null;
                 }
             });
-#if !VS14
+
             if (nuGetProject is LegacyPackageReferenceProject)
             {
                 // trigger solution restore and don't wait for it to be complete and hold the UI thread
                 System.Threading.Tasks.Task.Run(() => _solutionRestoreWorker.Value.ScheduleRestoreAsync(SolutionRestoreRequest.ByMenu(), CancellationToken.None));
             }
-#endif
+
             return VSConstants.S_OK;
         }
         #endregion