Updating Roslyn to 2.6.0-beta1-62113-02

sqeezy · Sep 18, 2017 · 588dd98 · 588dd98
1 parent 566acd2
commit 588dd98
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -28,8 +28,15 @@
     <!-- Enables workaround for https://github.com/NuGet/Home/issues/4695. -->
     <RepoToolsetQuietRestore>true</RepoToolsetQuietRestore>
 
-    <!-- All projects in this repository target the same framework -->
-    <TargetFramework>net46</TargetFramework>
+    <!-- All projects in this repository target the same framework by default -->
+    <TargetFramework Condition="'$(IsTestProject)' != 'true'">net46</TargetFramework>
+
+    <!--
+      All tests projects in this repository target another. This includes the DeployTestDependencies
+      and DeployIntegrationDependencies projects which must be updated independently.
+    -->
+    <TargetFramework Condition="$(MSBuildProjectName.EndsWith('.UnitTests')) or $(MSBuildProjectName.EndsWith('.IntegrationTests'))">net461</TargetFramework>
+
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <VSSDKTargetPlatformRegRootSuffix Condition="'$(RootSuffix)' != ''">$(RootSuffix)</VSSDKTargetPlatformRegRootSuffix>

diff --git a/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj b/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PlatformTarget>x86</PlatformTarget>
+    <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.IntegrationTests\Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj" />

diff --git a/src/DeployTestDependencies/DeployTestDependencies.csproj b/src/DeployTestDependencies/DeployTestDependencies.csproj
@@ -1,5 +1,8 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.VisualStudio.AppDesigner\Microsoft.VisualStudio.AppDesigner.vbproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.Editors\Microsoft.VisualStudio.Editors.vbproj" />

diff --git a/...ojectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj b/...ojectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj
@@ -8,12 +8,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.IntegrationTest.Utilities" Version="$(MicrosoftVisualStudioIntegrationTestUtilitiesVersion)" />
   </ItemGroup>
-  <ItemGroup>
-    <!-- TODO: these should be dependencies of Microsoft.VisualStudio.IntegrationTest.Utilities -->
-    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native.x86" Version="$(MicrosoftVisualStudioSetupConfigurationNativex86Version)" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>