diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index 1ef8573da0b9823bea991d478662d2c4aabd9da4..fba6d47738a12b808ba9f9de254ed7a442e323bb 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -3,9 +3,7 @@ trigger: - master - master-vs-deps - dev16.0-preview2 -- dev16.0-preview2-vs-deps - dev16.0-preview3 -- dev16.0-preview3-vs-deps - dev16.1-preview1 - dev16.1-preview1-vs-deps @@ -16,9 +14,7 @@ pr: - features/* - demos/* - dev16.0-preview2 -- dev16.0-preview2-vs-deps - dev16.0-preview3 -- dev16.0-preview3-vs-deps - dev16.1-preview1 - dev16.1-preview1-vs-deps diff --git a/global.json b/global.json index 1ba613bf46a8c66caa2abc6600749b2a624f34db..cea5dd4de274b095ff0eec231d2815dcae249981 100644 --- a/global.json +++ b/global.json @@ -2,7 +2,7 @@ "tools": { "dotnet": "2.1.401", "vs": { - "version": "15.8" + "version": "16.0" }, "xcopy-msbuild": "15.9.0-alpha" }, diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/App.config b/src/VisualStudio/IntegrationTest/TestUtilities/App.config index d8b5190ff3f287c0fc5399a98b22127fb59bc225..832ec6cd649b7b9c76411a719d71f88890b3f302 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/App.config +++ b/src/VisualStudio/IntegrationTest/TestUtilities/App.config @@ -10,7 +10,7 @@ - 15 + 16 RoslynDev diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs b/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs index 2f68ffd9db314ea65194c63795acd171305d9fb0..e80ef46216896a66c3814409bd145ed41cb674fd 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.IntegrationTest.Utilities { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -25,7 +25,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("15")] + [global::System.Configuration.DefaultSettingValueAttribute("16")] public string VsProductVersion { get { return ((string)(this["VsProductVersion"])); diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings b/src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings index ae0b5fbb4e90ba2ec69b69c2226a97360d779d7b..f8d860ad69e4d7f2a92c7604d0c8f28e205caea6 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings +++ b/src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings @@ -3,7 +3,7 @@ - 15 + 16 RoslynDev diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs index 9b7f4cbf78b5c498b938c1eb71ddb1cbd4f3d8a1..c1849a80f96f04feda96a2e85cc37364cda948c1 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs @@ -39,9 +39,9 @@ static VisualStudioInstanceFactory() { var majorVsProductVersion = VsProductVersion.Split('.')[0]; - if (int.Parse(majorVsProductVersion) < 15) + if (int.Parse(majorVsProductVersion) < 16) { - throw new PlatformNotSupportedException("The Visual Studio Integration Test Framework is only supported on Visual Studio 15.0 and later."); + throw new PlatformNotSupportedException("The Visual Studio Integration Test Framework is only supported on Visual Studio 16.0 and later."); } }