Merge pull request #14699 from jaredpar/buildboss

MSBuild project file validation and cleanup

Merge pull request #14699 from jaredpar/buildboss
MSBuild project file validation and cleanup
415b1449 · Jared Parsons · GitHub · 6a15381b · cf7589e9 · 415b1449
120 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -353,6 +353,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicesVisualStudio.Next",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioTest.Next", "src\VisualStudio\Core\Test.Next\VisualStudioTest.Next.csproj", "{2E1658E2-5045-4F85-A64C-C0ECCD39F719}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildBoss", "src\Tools\BuildBoss\BuildBoss.csproj", "{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
@@ -3080,6 +3082,26 @@ Global
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|x64.Build.0 = Release|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|x86.ActiveCfg = Release|Any CPU
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719}.Release|x86.Build.0 = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|ARM.Build.0 = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x64.Build.0 = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3245,5 +3267,6 @@ Global
 		{7259740A-FD0E-480F-A7D4-08BE90AC9051} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{FE0D4BDD-1C30-488E-A870-854F5B8C5014} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719} = {8DBA5174-B0AA-4561-82B1-A46607697753}
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 	EndGlobalSection
 EndGlobal
--- a/build/config/BuildBossData.json
+++ b/build/config/BuildBossData.json
+{
+    "exclude": [
+        "src\\Workspaces\\CoreTest\\TestFiles",
+        "src\\Setup\\Templates"
+    ]
+}
+
--- a/cibuild.cmd
+++ b/cibuild.cmd
@@ -121,6 +121,10 @@ REM Verify the state of our project.jsons
 echo Running RepoUtil
 .\Binaries\%BuildConfiguration%\Tools\RepoUtil\RepoUtil.exe verify || goto :BuildFailed

+REM Verify the state of our project.jsons
+echo Running BuildBoss
+.\Binaries\%BuildConfiguration%\Exes\BuildBoss\BuildBoss.exe %RoslynRoot% || goto :BuildFailed
+
 REM Ensure caller sees successful exit.
 exit /b 0


--- a/src/Compilers/CSharp/CscCore/CscCore.csproj
+++ b/src/Compilers/CSharp/CscCore/CscCore.csproj
@@ -12,8 +12,6 @@
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
    <StartupObject>Microsoft.CodeAnalysis.CSharp.CommandLine.Program</StartupObject>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <ServiceablePackage>true</ServiceablePackage>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

--- a/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
+++ b/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj
@@ -10,11 +10,9 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <ServiceablePackage>true</ServiceablePackage>
    <SyntaxDefinition>$(MSBuildThisFileDirectory)Syntax\Syntax.xml</SyntaxDefinition>
    <RoslynProjectType>Dll</RoslynProjectType>

--- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj
+++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen</RootNamespace>
    <AssemblyName>Roslyn.Compilers.CSharp.WinRT.UnitTests</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

--- a/src/Compilers/CSharp/csc/csc.csproj
+++ b/src/Compilers/CSharp/csc/csc.csproj
@@ -13,8 +13,6 @@
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
    <StartupObject>Microsoft.CodeAnalysis.CSharp.CommandLine.Program</StartupObject>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj
+++ b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj
@@ -11,8 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.UnitTests</RootNamespace>
    <AssemblyName>Roslyn.Compilers.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
+++ b/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj
@@ -12,7 +12,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.BuildTasks</RootNamespace>
    <AssemblyName>Microsoft.Build.Tasks.CodeAnalysis</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

--- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
+++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
@@ -11,8 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.BuildTasks.UnitTests</RootNamespace>
    <AssemblyName>Microsoft.Build.Tasks.CodeAnalysis.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/Core/Portable/CodeAnalysis.csproj
+++ b/src/Compilers/Core/Portable/CodeAnalysis.csproj
@@ -10,11 +10,9 @@
    <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <ServiceablePackage>true</ServiceablePackage>
    <DefineConstants>$(DefineConstants);COMPILERCORE</DefineConstants>
    <CodeAnalysisRuleSet>..\CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>

--- a/src/Compilers/RealParserTests/RealParserTests.csproj
+++ b/src/Compilers/RealParserTests/RealParserTests.csproj
@@ -9,7 +9,6 @@
    <RootNamespace>RealParserTests</RootNamespace>
    <AssemblyName>RealParserTests</AssemblyName>
    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -90,4 +89,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Compilers/Server/PortableServer/PortableServer.csproj
+++ b/src/Compilers/Server/PortableServer/PortableServer.csproj
@@ -12,8 +12,6 @@
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
    <StartupObject>Microsoft.CodeAnalysis.CompilerServer.Program</StartupObject>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
+++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
@@ -13,8 +13,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CompilerServer</RootNamespace>
    <AssemblyName>VBCSCompiler</AssemblyName>
    <LargeAddressAware>true</LargeAddressAware>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
+++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
@@ -11,8 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CompilerServer.UnitTests</RootNamespace>
    <AssemblyName>Roslyn.Compilers.CompilerServer.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
+++ b/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj
@@ -9,11 +9,9 @@
    <ProjectGuid>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Roslyn.Compilers.Test.Resources</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj
+++ b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj
@@ -11,7 +11,6 @@
    <AssemblyName>Roslyn.Compilers.CSharp.Test.Utilities</AssemblyName>
    <Nonshipping>true</Nonshipping>
    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

--- a/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
+++ b/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj
@@ -8,11 +8,9 @@
    <ProjectGuid>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <ServiceablePackage>true</ServiceablePackage>
    <SyntaxDefinition>$(MSBuildThisFileDirectory)Syntax\Syntax.xml</SyntaxDefinition>
    <RoslynProjectType>Dll</RoslynProjectType>

--- a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
+++ b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
@@ -12,8 +12,6 @@
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
    <StartupObject>Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program</StartupObject>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <ServiceablePackage>true</ServiceablePackage>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

--- a/src/Compilers/VisualBasic/vbc/vbc.csproj
+++ b/src/Compilers/VisualBasic/vbc/vbc.csproj
@@ -13,8 +13,6 @@
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
    <StartupObject>Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program</StartupObject>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>

--- a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
+++ b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
@@ -8,8 +8,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.EditorFeatures</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <CopyNuGetImplementations>false</CopyNuGetImplementations>
    <RoslynProjectType>Dll</RoslynProjectType>

--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectLanguage>CSharp</ProjectLanguage>
-    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>

--- a/src/EditorFeatures/Test/EditorServicesTest.csproj
+++ b/src/EditorFeatures/Test/EditorServicesTest.csproj
@@ -10,10 +10,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.Editor.UnitTests</RootNamespace>
    <AssemblyName>Roslyn.Services.Editor.UnitTests</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <TargetFrameworkProfile />
-    <RestorePackages>true</RestorePackages>
    <CopyNuGetImplementations>true</CopyNuGetImplementations>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
@@ -9,11 +9,9 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
@@ -8,7 +8,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
@@ -9,7 +9,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.Concord.DoNotUse</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <ConcordDir>$(MSBuildThisFileDirectory)</ConcordDir>
    <NonShipping>true</NonShipping>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
@@ -8,7 +8,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
@@ -9,7 +9,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests</RootNamespace>
    <AssemblyName>Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <CopyNuGetImplementations>false</CopyNuGetImplementations>

--- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
+++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
@@ -22,8 +22,6 @@
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
    <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
    <TargetVsixContainerName>ExpressionEvaluatorPackage.vsix</TargetVsixContainerName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>Vsix</RoslynProjectType>
  </PropertyGroup>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
@@ -7,11 +7,9 @@
    <ProjectGuid>{73242A2D-6300-499D-8C15-FADF7ECB185C}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
@@ -13,7 +13,6 @@
    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
    <VBSyntaxGeneratorToolPath>$(OutDir)..\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
-    <RestorePackages>true</RestorePackages>
    <CopyNuGetImplementations>false</CopyNuGetImplementations>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>

--- a/src/Features/CSharp/Portable/CSharpFeatures.csproj
+++ b/src/Features/CSharp/Portable/CSharpFeatures.csproj
@@ -9,11 +9,9 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.Features</AssemblyName>
    <TargetExt>.dll</TargetExt>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
@@ -8,11 +8,9 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.Features</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
+++ b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
@@ -9,11 +9,9 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.Features</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Interactive/CsiCore/CsiCore.csproj
+++ b/src/Interactive/CsiCore/CsiCore.csproj
@@ -10,8 +10,6 @@
    <AssemblyName>csi</AssemblyName>
    <PlatformTarget>x64</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/Interactive/Host/InteractiveHost.csproj
+++ b/src/Interactive/Host/InteractiveHost.csproj
@@ -8,8 +8,6 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>InteractiveHost</RootNamespace>
    <AssemblyName>InteractiveHost</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>

--- a/src/Interactive/VbiCore/VbiCore.vbproj
+++ b/src/Interactive/VbiCore/VbiCore.vbproj
@@ -12,8 +12,6 @@
    <AssemblyName>vbi</AssemblyName>
    <PlatformTarget>x64</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/Interactive/csi/csi.csproj
+++ b/src/Interactive/csi/csi.csproj
@@ -11,8 +11,6 @@
    <AssemblyName>csi</AssemblyName>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>

--- a/src/Interactive/vbi/vbi.vbproj
+++ b/src/Interactive/vbi/vbi.vbproj
@@ -13,8 +13,6 @@
    <AssemblyName>vbi</AssemblyName>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj
+++ b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj
@@ -4,12 +4,6 @@
  <PropertyGroup>
    <DeployToSamplesSubfolder>false</DeployToSamplesSubfolder>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj
@@ -12,7 +12,6 @@
    <RootNamespace>CSharpAnalyzers.Test</RootNamespace>
    <AssemblyName>CSharpAnalyzers.Test</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj
@@ -8,7 +8,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>CSharpAnalyzers</RootNamespace>
    <AssemblyName>CSharpAnalyzers</AssemblyName>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj
+++ b/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj
@@ -15,7 +15,6 @@
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <ScrubbedSamplePath>CSharp\ConsoleClassifier</ScrubbedSamplePath>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">

--- a/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj
+++ b/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj
@@ -2,14 +2,8 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
    <ScrubbedSamplePath>CSharp\ConvertToAutoProperty</ScrubbedSamplePath>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">

--- a/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj
+++ b/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj
@@ -2,13 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\EditorFeatures\Core\EditorFeatures.csproj">

--- a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj
+++ b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj
@@ -10,7 +10,6 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ConvertToConditionalCS.UnitTests</RootNamespace>
    <AssemblyName>ConvertToConditionalCS.UnitTests</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj
+++ b/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj
@@ -2,13 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">

--- a/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj
+++ b/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj
@@ -10,9 +10,7 @@
    <RootNamespace>FormatSolution</RootNamespace>
    <AssemblyName>FormatSolution</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <ScrubbedSamplePath>CSharp\FormatSolution</ScrubbedSamplePath>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\</SolutionDir>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/CSharp/FormatSolution/TestSolutionForCSharp/CSharpProject/CSharpProject.csproj
+++ b/src/Samples/CSharp/FormatSolution/TestSolutionForCSharp/CSharpProject/CSharpProject.csproj
@@ -12,7 +12,6 @@
    <RootNamespace>CSharpProject</RootNamespace>
    <AssemblyName>CSharpProject</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>

--- a/src/Samples/CSharp/FormatSolution/TestSolutionForCSharp/VisualBasicProject/VisualBasicProject.vbproj
+++ b/src/Samples/CSharp/FormatSolution/TestSolutionForCSharp/VisualBasicProject/VisualBasicProject.vbproj
@@ -10,7 +10,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>VisualBasicProject</RootNamespace>
    <AssemblyName>VisualBasicProject</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
  </PropertyGroup>

--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj
@@ -2,13 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
    <ImportVSSDKTargets>true</ImportVSSDKTargets>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">

--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj
@@ -11,7 +11,6 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ImplementNotifyPropertyChangedCS.UnitTests</RootNamespace>
    <AssemblyName>ImplementNotifyPropertyChangedCS.UnitTests</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj
+++ b/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj
@@ -4,14 +4,6 @@
    <UseRoslynAnalyzers>false</UseRoslynAnalyzers>
  </PropertyGroup>
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
-  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>

--- a/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj
+++ b/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
-  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\src\Workspaces\CSharp\Portable\CSharpWorkspace.csproj">
      <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>

--- a/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj
+++ b/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj
@@ -14,8 +14,6 @@
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj
+++ b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj
@@ -11,7 +11,6 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Roslyn.UnitTestFramework</RootNamespace>
    <AssemblyName>Roslyn.UnitTestFramework</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="File References">

--- a/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj
+++ b/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj
@@ -3,12 +3,6 @@
  <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/BasicAnalyzers.Test.vbproj
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/BasicAnalyzers.Test.vbproj
@@ -7,7 +7,6 @@
    <ProjectGuid>{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>BasicAnalyzers.Test</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <TargetFrameworkProfile />

--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/BasicAnalyzers.vbproj
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/BasicAnalyzers.vbproj
@@ -12,9 +12,7 @@
    <AssemblyName>BasicAnalyzers</AssemblyName>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>

--- a/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj
+++ b/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj
@@ -13,11 +13,9 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>ConsoleClassifier</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <ScrubbedSamplePath>VisualBasic\ConsoleClassifier</ScrubbedSamplePath>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\</SolutionDir>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
-  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>

--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj
@@ -11,7 +11,6 @@
    <NonShipping>true</NonShipping>
    <MyType>Windows</MyType>
    <OptionStrict>Off</OptionStrict>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj
+++ b/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj
@@ -10,11 +10,9 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>FormatSolution</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <ScrubbedSamplePath>VisualBasic\FormatSolution</ScrubbedSamplePath>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\</SolutionDir>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Samples/VisualBasic/FormatSolution/TestSolutionForVB/CSharpProject/CSharpProject.csproj
+++ b/src/Samples/VisualBasic/FormatSolution/TestSolutionForVB/CSharpProject/CSharpProject.csproj
@@ -12,7 +12,6 @@
    <RootNamespace>CSharpProject</RootNamespace>
    <AssemblyName>CSharpProject</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>

--- a/src/Samples/VisualBasic/FormatSolution/TestSolutionForVB/VisualBasicProject/VisualBasicProject.vbproj
+++ b/src/Samples/VisualBasic/FormatSolution/TestSolutionForVB/VisualBasicProject/VisualBasicProject.vbproj
@@ -10,7 +10,6 @@
    <OutputType>Library</OutputType>
    <RootNamespace>VisualBasicProject</RootNamespace>
    <AssemblyName>VisualBasicProject</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
  </PropertyGroup>

--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
-  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>

--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj
@@ -10,7 +10,6 @@
    <RootNamespace>ImplementNotifyPropertyChangedVB.UnitTests</RootNamespace>
    <AssemblyName>ImplementNotifyPropertyChangedVB.UnitTests</AssemblyName>
    <VBRuntime>Default</VBRuntime>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj
+++ b/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj
@@ -4,14 +4,6 @@
    <UseRoslynAnalyzers>false</UseRoslynAnalyzers>
  </PropertyGroup>
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
-  <PropertyGroup>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
@@ -39,7 +31,6 @@
    <RootNamespace>MakeConstVB</RootNamespace>
    <AssemblyName>MakeConstVB</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <GeneratePkgDefFile>false</GeneratePkgDefFile>
    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>

--- a/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj
+++ b/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj
@@ -3,12 +3,6 @@
  <Import Project="..\..\..\..\..\build\Targets\VSL.Settings.targets" />
  <PropertyGroup>
    <DeployToSamplesSubfolder>true</DeployToSamplesSubfolder>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\..\src\Compilers\Core\Portable\CodeAnalysis.csproj">
@@ -44,7 +38,6 @@
    <RootNamespace>RemoveByValVB</RootNamespace>
    <AssemblyName>RemoveByValVB</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <GeneratePkgDefFile>false</GeneratePkgDefFile>
    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>

--- a/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj
@@ -11,7 +11,6 @@
    <NonShipping>true</NonShipping>
    <MyType>Windows</MyType>
    <OptionStrict>Off</OptionStrict>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <RoslynProjectType>UnitTest</RoslynProjectType>
  </PropertyGroup>

--- a/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj
+++ b/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj
@@ -13,12 +13,10 @@
    <StartupObject>TreeTransformsVB.Module1</StartupObject>
    <RootNamespace>TreeTransformsVB</RootNamespace>
    <AssemblyName>TreeTransformsVB</AssemblyName>
-    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Scripting/CSharp/CSharpScripting.csproj
+++ b/src/Scripting/CSharp/CSharpScripting.csproj
@@ -8,13 +8,11 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.Scripting</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.Scripting</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Scripting/CSharpTest/CSharpScriptingTest.csproj
+++ b/src/Scripting/CSharpTest/CSharpScriptingTest.csproj
@@ -11,8 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>

--- a/src/Scripting/CoreTest/ScriptingTest.csproj
+++ b/src/Scripting/CoreTest/ScriptingTest.csproj
@@ -11,8 +11,6 @@
    <RootNamespace>Microsoft.CodeAnalysis.Scripting.Test</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.Scripting.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>

--- a/src/Scripting/VisualBasic/BasicScripting.vbproj
+++ b/src/Scripting/VisualBasic/BasicScripting.vbproj
@@ -7,13 +7,11 @@
    <ProjectGuid>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.Scripting</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <ItemGroup Label="Project References">

--- a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
+++ b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
@@ -10,8 +10,6 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>

--- a/src/Setup/BuildTasks/BuildTasks.vbproj
+++ b/src/Setup/BuildTasks/BuildTasks.vbproj
@@ -10,8 +10,6 @@
    <AssemblyName>Roslyn.Setup.BuildTasks</AssemblyName>
    <SignAssembly>false</SignAssembly>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>

--- a/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
+++ b/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
@@ -10,8 +10,6 @@
    <AssemblyName>DeployCoreClrTestRuntime_DoNotUse</AssemblyName>
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>

--- a/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
+++ b/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
@@ -10,8 +10,6 @@
    <OutputType>Library</OutputType>
    <AssemblyName>DeplyDesktopTestRuntime_DoNotUse</AssemblyName>
    <Nonshipping>true</Nonshipping>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkIdentifier />
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <CopyNuGetImplementations>true</CopyNuGetImplementations>

--- a/src/Test/PdbUtilities/PdbUtilities.csproj
+++ b/src/Test/PdbUtilities/PdbUtilities.csproj
@@ -10,11 +10,9 @@
    <OutputType>Library</OutputType>
    <RootNamespace>Roslyn.Test.PdbUtilities</RootNamespace>
    <AssemblyName>Roslyn.Test.PdbUtilities</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackages>true</RestorePackages>
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>

--- a/src/Test/Perf/Runner/Perf.Runner.csproj
+++ b/src/Test/Perf/Runner/Perf.Runner.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>Roslyn.Test.Performance.Runner</RootNamespace>
    <AssemblyName>Roslyn.Test.Performance.Runner</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <RoslynProjectType>ExeDesktop</RoslynProjectType>
  </PropertyGroup>
@@ -92,4 +91,4 @@
    <Folder Include="CPC-Consumption\" />
  </ItemGroup>
  <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/Test/Perf/Utilities/Perf.Utilities.csproj
+++ b/src/Test/Perf/Utilities/Perf.Utilities.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>Roslyn.Test.Performance.Utilities</RootNamespace>
    <AssemblyName>Roslyn.Test.Performance.Utilities</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <RoslynProjectType>Dll</RoslynProjectType>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

--- a/src/Test/Perf/tests/Perf.Tests.csproj
+++ b/src/Test/Perf/tests/Perf.Tests.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>Roslyn.Test.Performance.Tests</RootNamespace>
    <AssemblyName>Roslyn.Test.Performance.Tests</AssemblyName>
    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Nonshipping>true</Nonshipping>
    <RoslynProjectType>Dll</RoslynProjectType>

--- a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj
+++ b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj
@@ -11,8 +11,6 @@
    <AssemblyName>Roslyn.Test.Utilities.FX45</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Nonshipping>true</Nonshipping>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <CopyNuGetImplementations>true</CopyNuGetImplementations>
    <RoslynProjectType>Dll</RoslynProjectType>

--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
@@ -11,8 +11,6 @@
    <AssemblyName>Roslyn.Test.Utilities</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Nonshipping>true</Nonshipping>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

--- a/src/Tools/BuildBoss/App.config
+++ b/src/Tools/BuildBoss/App.config
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    </startup>
+</configuration>
--- a/src/Tools/BuildBoss/BuildBoss.csproj
+++ b/src/Tools/BuildBoss/BuildBoss.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BuildBoss</RootNamespace>
+    <AssemblyName>BuildBoss</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <TargetFrameworkProfile />
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuildBossConfig.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="ProjectType.cs" />
+    <Compile Include="ProjectUtil.cs" />
+    <Compile Include="SharedUtil.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
+</Project>
--- a/src/Tools/BuildBoss/BuildBoss.sln
+++ b/src/Tools/BuildBoss/BuildBoss.sln
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildBoss", "BuildBoss.csproj", "{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepoUtil", "..\RepoUtil\RepoUtil.csproj", "{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/src/Tools/BuildBoss/BuildBossConfig.cs
+++ b/src/Tools/BuildBoss/BuildBossConfig.cs
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BuildBoss
+{
+    public sealed class BuildBossConfig
+    {
+        /// <summary>
+        /// The set of projects and paths to exclude.
+        /// </summary>
+        [JsonProperty(PropertyName = "exclude")]
+        public string[] Exclude { get; set; }
+    }
+}
--- a/src/Tools/BuildBoss/Program.cs
+++ b/src/Tools/BuildBoss/Program.cs
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace BuildBoss
+{
+    internal static class Program
+    {
+        internal static int Main(string[] args)
+        {
+            var sourceDir = args[0];
+            Console.WriteLine(sourceDir);
+            var configPath = Path.Combine(sourceDir, @"build\config\BuildBossData.json");
+            var config = JsonConvert.DeserializeObject<BuildBossConfig>(File.ReadAllText(configPath));
+            var allGood = true;
+            var list = new List<string>();
+
+            foreach (var projectPath in Directory.EnumerateFiles(Path.Combine(sourceDir, "src"), "*proj", SearchOption.AllDirectories))
+            {
+                var relativePath = GetRelativePath(sourceDir, projectPath);
+                if (Exclude(config, relativePath))
+                {
+                    continue;
+                }
+
+                var doc = XDocument.Load(projectPath);
+                var projectType = GetProjectType(projectPath);
+                var util = new ProjectUtil(projectType, projectPath, doc);
+                var textWriter = new StringWriter();
+                if (!util.CheckAll(textWriter))
+                {
+                    Console.WriteLine($"Checking {relativePath} failed");
+                    Console.WriteLine(textWriter.ToString());
+                    list.Add(relativePath);
+                    allGood = false;
+                }
+            }
+
+            // Print it all out in the end for easy editting.
+            foreach (var item in list)
+            {
+                Console.WriteLine(item);
+            }
+
+            return allGood ? 0 : 1;
+        }
+
+        private static ProjectType GetProjectType(string path)
+        {
+            switch (Path.GetExtension(path))
+            {
+                case ".csproj": return ProjectType.CSharp;
+                case ".vbproj": return ProjectType.Basic;
+                case ".shproj": return ProjectType.Shared;
+                default:
+                    return ProjectType.Unknown;
+            }
+        }
+
+        private static string GetRelativePath(string basePath, string fullPath)
+        {
+            if (!fullPath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase))
+            {
+                throw new Exception($"{fullPath} doesn't begin with {basePath}");
+            }
+
+            var path = fullPath.Substring(basePath.Length);
+            if (path.Length > 0 && path[0] == '\\')
+            {
+                path = path.Substring(1);
+            }
+
+            return path;
+        }
+
+        private static bool Exclude(BuildBossConfig config, string projectRelativePath)
+        {
+            foreach (var exclude in config.Exclude)
+            {
+                if (projectRelativePath.StartsWith(exclude, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
--- a/src/Tools/BuildBoss/ProjectType.cs
+++ b/src/Tools/BuildBoss/ProjectType.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BuildBoss
+{
+    internal enum ProjectType
+    {
+        CSharp,
+        Basic,
+        Shared,
+        Unknown
+    }
+}
--- a/src/Tools/BuildBoss/ProjectUtil.cs
+++ b/src/Tools/BuildBoss/ProjectUtil.cs
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.XPath;
+
+namespace BuildBoss
+{
+    internal sealed class ProjectUtil
+    {
+        private readonly XDocument _projectData;
+        private readonly XmlNamespaceManager _manager;
+
+        internal ProjectType ProjectType { get; }
+        internal string ProjectFilePath { get; }
+
+        internal ProjectUtil(ProjectType projectType, string projectFilePath, XDocument projectData)
+        {
+            ProjectType = projectType;
+            ProjectFilePath = projectFilePath;
+            _projectData = projectData;
+            _manager = new XmlNamespaceManager(new NameTable());
+            _manager.AddNamespace("mb", SharedUtil.MSBuildNamespaceUriRaw);
+        }
+
+        internal bool CheckAll(TextWriter textWriter)
+        {
+            var allGood = true;
+            if (ProjectType == ProjectType.CSharp || ProjectType == ProjectType.Basic)
+            {
+                allGood &= CheckForProperty(textWriter, "RestorePackages");
+                allGood &= CheckForProperty(textWriter, "SolutionDir");
+                allGood &= CheckForProperty(textWriter, "FileAlignment");
+                allGood &= CheckForProperty(textWriter, "FileUpgradeFlags");
+                allGood &= CheckForProperty(textWriter, "UpgradeBackupLocation");
+                allGood &= CheckForProperty(textWriter, "OldToolsVersion");
+            }
+
+            return allGood;
+        }
+
+        private bool CheckForProperty(TextWriter textWriter, string propertyName)
+        {
+            var groups = _projectData.XPathSelectElements("//mb:PropertyGroup", _manager);
+            foreach(var group in groups)
+            {
+                foreach (var element in group.Elements())
+                {
+                    if (element.Name.LocalName == propertyName)
+                    {
+                        textWriter.WriteLine($"\tDo not use {propertyName}");
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
--- a/src/Tools/BuildBoss/README.md
+++ b/src/Tools/BuildBoss/README.md
+# BuildBoss
+
+This is a tool to validate the content of our project files.
+
--- a/src/Tools/BuildBoss/SharedUtil.cs
+++ b/src/Tools/BuildBoss/SharedUtil.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace BuildBoss
+{
+    internal static class SharedUtil
+    {
+        internal static string MSBuildNamespaceUriRaw => "http://schemas.microsoft.com/developer/msbuild/2003";
+        internal static Uri MSBuildNamespaceUri { get; } = new Uri(MSBuildNamespaceUriRaw);
+        internal static XNamespace MSBuildNamespace { get; } = XNamespace.Get(MSBuildNamespaceUriRaw);
+        internal static Encoding Encoding { get; } = Encoding.UTF8;
+    }
+}
--- a/src/Tools/BuildBoss/project.json
+++ b/src/Tools/BuildBoss/project.json
+{
+    "supports": { },
+    "dependencies": {
+        "Newtonsoft.Json": "8.0.3",
+        "System.Collections.Immutable": "1.2.0"
+    },
+    "frameworks": {
+        ".NETFramework,Version=v4.6": { }
+    },
+    "runtimes": {
+        "win": { },
+        "win7": { }
+    }
+}
\ No newline at end of file
--- a/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj
+++ b/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>Roslyn.MSBuild.Util</RootNamespace>
    <AssemblyName>Roslyn.MSBuild.Util</AssemblyName>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

--- a/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
+++ b/src/Tools/CommonCoreClrRuntime/CommonCoreClrRuntime.csproj
@@ -10,8 +10,6 @@
    <AssemblyName>CommonCoreClrRuntime_DoNotUse</AssemblyName>
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <NonShipping>true</NonShipping>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

--- a/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
+++ b/src/Tools/CommonNetCoreReferences/CommonNetCoreReferences.csproj
@@ -10,8 +10,6 @@
    <AssemblyName>CommonNetCoreReferences_DoNotUse</AssemblyName>
    <Prefer32Bit>false</Prefer32Bit>
    <LargeAddressAware>true</LargeAddressAware>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
    <NonShipping>true</NonShipping>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

--- a/src/Tools/Github/GitMergeBot/GitMergeBot.csproj
+++ b/src/Tools/Github/GitMergeBot/GitMergeBot.csproj
@@ -10,7 +10,6 @@
    <RootNamespace>GitMergeBot</RootNamespace>
    <AssemblyName>GitMergeBot</AssemblyName>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

--- a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
+++ b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
@@ -9,7 +9,6 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>ProcessWatchdog</RootNamespace>
    <AssemblyName>ProcessWatchdog</AssemblyName>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <SignAssembly>false</SignAssembly>
    <RoslynProjectType>ToolDesktop</RoslynProjectType>

--- a/src/Tools/RepoUtil/RepoUtil.csproj
+++ b/src/Tools/RepoUtil/RepoUtil.csproj
--- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
--- a/src/Tools/Source/DebuggerVisualizers/Roslyn.DebuggerVisualizers.csproj
+++ b/src/Tools/Source/DebuggerVisualizers/Roslyn.DebuggerVisualizers.csproj
--- a/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj
+++ b/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj
--- a/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
+++ b/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
--- a/src/Tools/Source/RunTests/RunTests.csproj
+++ b/src/Tools/Source/RunTests/RunTests.csproj
--- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj
+++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj
--- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj
+++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj
--- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj
+++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj
--- a/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
+++ b/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj
--- a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
+++ b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj
--- a/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj
+++ b/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj
--- a/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj
+++ b/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj
--- a/src/Workspaces/Core/Portable/Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Workspaces.csproj
--- a/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj
+++ b/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj