From 4c48533d4d09d9715935afd63cb6aa53a2952de1 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 20 Jan 2022 09:28:42 -0800 Subject: [PATCH 1/4] override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn --- .../content/repos/Directory.Build.props | 1 + .../tarball/content/repos/roslyn.proj | 1 + ...05-Build-a-subset-of-roslyn-projects.patch | 146 ------------------ ...-missing-imports-during-source-build.patch | 88 +++++++++++ 4 files changed, 90 insertions(+), 146 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch create mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 69dab2b18c81..e61a6e689782 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -154,5 +154,6 @@ + diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 6aeeebdf2370..0f43286ce339 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch deleted file mode 100644 index 275d6dcecbac..000000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 110fc28ea7c17d57bbd5ce8ed3fc4e2b0274c5b3 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 22 Oct 2021 22:17:37 +0000 -Subject: [PATCH] Build a subset of roslyn projects - -Some projects use Microsoft.NET.Sdk.WindowsDesktop sdk -which cannot be built using a boostrapped source-build -sdk, since WindowsDesktop is not supported. These cannot -be ignored using ExcludeFromSourceBuild because the project -still needs to be loaded and the sdk cannot be found. - -See https://github.com/dotnet/roslyn/issues/57342 ---- - Roslyn.SourceBuild.slnf | 105 ++++++++++++++++++++++++++++++++++++++++ - eng/SourceBuild.props | 2 +- - 2 files changed, 106 insertions(+), 1 deletion(-) - create mode 100644 Roslyn.SourceBuild.slnf - -diff --git a/Roslyn.SourceBuild.slnf b/Roslyn.SourceBuild.slnf -new file mode 100644 -index 00000000000..e6f8eb315bf ---- /dev/null -+++ b/Roslyn.SourceBuild.slnf -@@ -0,0 +1,105 @@ -+{ -+ "solution": { -+ "path": "Roslyn.sln", -+ "projects": [ -+ "src\\Deployment\\RoslynDeployment.csproj", -+ "src\\Compilers\\Core\\Portable\\Microsoft.CodeAnalysis.csproj", -+ "src\\Compilers\\Server\\VBCSCompiler\\VBCSCompiler.csproj", -+ "src\\Compilers\\CSharp\\csc\\csc.csproj", -+ "src\\Compilers\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.csproj", -+ "src\\Compilers\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.vbproj", -+ "src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpErrorFactsGenerator\\CSharpErrorFactsGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicSyntaxGenerator\\VisualBasicSyntaxGenerator.vbproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicErrorFactsGenerator\\VisualBasicErrorFactsGenerator.vbproj", -+ "src\\Workspaces\\Core\\Desktop\\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", -+ "src\\Workspaces\\Core\\MSBuild\\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", -+ "src\\Workspaces\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", -+ "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", -+ "src\\Features\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", -+ "src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj", -+ "src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj", -+ "src\\Scripting\\VisualBasic\\Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj", -+ "src\\Scripting\\Core\\Microsoft.CodeAnalysis.Scripting.csproj", -+ "src\\Scripting\\CSharp\\Microsoft.CodeAnalysis.CSharp.Scripting.csproj", -+ "src\\ExpressionEvaluator\\Package\\ExpressionEvaluatorPackage.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj", -+ "src\\Compilers\\Core\\AnalyzerDriver\\AnalyzerDriver.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\BasicResultProvider.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\NetFX20\\BasicResultProvider.NetFX20.vbproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\CSharpResultProvider.shproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\NetFX20\\CSharpResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\ResultProvider.shproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\NetFX20\\ResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.ResultProvider.csproj", -+ "src\\Compilers\\VisualBasic\\vbc\\vbc.csproj", -+ "src\\Compilers\\VisualBasic\\BasicAnalyzerDriver\\BasicAnalyzerDriver.shproj", -+ "src\\Compilers\\CSharp\\CSharpAnalyzerDriver\\CSharpAnalyzerDriver.shproj", -+ "src\\Compilers\\Core\\CommandLine\\CommandLine.shproj", -+ "src\\Compilers\\Extension\\Roslyn.Compilers.Extension.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.shproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.shproj", -+ "src\\Workspaces\\Remote\\Core\\Microsoft.CodeAnalysis.Remote.Workspaces.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub\\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", -+ "src\\Compilers\\Core\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.csproj", -+ "src\\Tools\\BuildBoss\\BuildBoss.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\FunctionResolver\\Microsoft.CodeAnalysis.FunctionResolver.csproj", -+ "src\\CodeStyle\\Core\\Analyzers\\Microsoft.CodeAnalysis.CodeStyle.csproj", -+ "src\\CodeStyle\\Core\\CodeFixes\\Microsoft.CodeAnalysis.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\CSharp\\Analyzers\\Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj", -+ "src\\CodeStyle\\CSharp\\CodeFixes\\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\VisualBasic\\Analyzers\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.vbproj", -+ "src\\CodeStyle\\VisualBasic\\CodeFixes\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj", -+ "src\\Tools\\AnalyzerRunner\\AnalyzerRunner.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.Package.csproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers\\Microsoft.Net.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.NETCore.Compilers\\Microsoft.NETCore.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Scripting.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Package.csproj", -+ "src\\Setup\\DevDivVsix\\CompilersPackage\\Microsoft.CodeAnalysis.Compilers.Setup.csproj", -+ "src\\Setup\\Installer\\Installer.Package.csproj", -+ "src\\Setup\\DevDivInsertionFiles\\DevDivInsertionFiles.csproj", -+ "src\\Tools\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj", -+ "src\\Tools\\ExternalAccess\\Razor\\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers.Toolset\\Microsoft.Net.Compilers.Toolset.Package.csproj", -+ "src\\Features\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", -+ "src\\Tools\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", -+ "src\\Tools\\ExternalAccess\\Xamarin.Remote\\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", -+ "src\\Tools\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj", -+ "src\\Tools\\IdeBenchmarks\\IdeBenchmarks.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\IOperationGenerator\\CompilersIOperationGenerator.csproj", -+ "src\\Features\\Lsif\\Generator\\Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\Core\\CompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\Core\\WorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\CSharp\\CSharpCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\CSharp\\CSharpWorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\VisualBasic\\VisualBasicCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\VisualBasic\\VisualBasicWorkspaceExtensions.shproj", -+ "src\\Analyzers\\Core\\Analyzers\\Analyzers.shproj", -+ "src\\Analyzers\\Core\\CodeFixes\\CodeFixes.shproj", -+ "src\\Analyzers\\CSharp\\Analyzers\\CSharpAnalyzers.shproj", -+ "src\\Analyzers\\CSharp\\CodeFixes\\CSharpCodeFixes.shproj", -+ "src\\Analyzers\\VisualBasic\\Analyzers\\VisualBasicAnalyzers.shproj", -+ "src\\Analyzers\\VisualBasic\\CodeFixes\\VisualBasicCodeFixes.shproj", -+ "src\\Tools\\IdeCoreBenchmarks\\IdeCoreBenchmarks.csproj", -+ "src\\Tools\\BuildValidator\\BuildValidator.csproj", -+ "src\\Tools\\BuildActionTelemetryTable\\BuildActionTelemetryTable.csproj", -+ "src\\CodeStyle\\Tools\\CodeStyleConfigFileGenerator.csproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.shproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.Package.csproj", -+ "src\\Compilers\\Core\\Rebuild\\Microsoft.CodeAnalysis.Rebuild.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub.CoreComponents\\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj" -+ ] -+ } -+} -\ No newline at end of file -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 92e316a4744..9905b35467e 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,7 +11,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch new file mode 100644 index 000000000000..5580e806899a --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch @@ -0,0 +1,88 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Wed, 19 Jan 2022 15:58:24 -0800 +Subject: [PATCH] condition out missing imports during source build + +During source-build, the Microsoft.NET.Sdk.WindowsDesktop SDK in these files is +overriden to tools-local/EmptySdk, which has stubbed out targets for Build, +Restore, Pack, etc. This prevents these projects from being built during +source-build and also prevents them from loading the WindowsDesktop SDK, which +is non-free software. Even though these projects won't be built, we still need +to condition out some targets and imports that won't be around during +source-build or due to overriding the WindowsDesktop SDK. + +--- + ...rosoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj | 2 +- + src/Interactive/HostProcess/InteractiveHost32.csproj | 4 ++-- + src/Interactive/HostProcess/InteractiveHost64.csproj | 2 +- + .../Core/Def/Microsoft.VisualStudio.LanguageServices.csproj | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj +index 57f6b2f582f..d41f6b07d3a 100644 +--- a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj ++++ b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj +@@ -68,5 +68,5 @@ + + + +- ++ + +diff --git a/src/Interactive/HostProcess/InteractiveHost32.csproj b/src/Interactive/HostProcess/InteractiveHost32.csproj +index 7b0f0fa7f69..a9d27a745ec 100644 +--- a/src/Interactive/HostProcess/InteractiveHost32.csproj ++++ b/src/Interactive/HostProcess/InteractiveHost32.csproj +@@ -1,7 +1,7 @@ +  + + +- ++ + + true + Exe +@@ -25,7 +25,7 @@ + + Use BuiltProjectOutputGroup as the dependend target to ensure the targets has all dependencies that BuiltProjectOutputGroupOutput would have. + --> +- ++ + + <_PublishProjectOutputGroup Include="$(TargetPath)"> + $(TargetFileName) +diff --git a/src/Interactive/HostProcess/InteractiveHost64.csproj b/src/Interactive/HostProcess/InteractiveHost64.csproj +index 7aa8d1281f6..9ba077901ee 100644 +--- a/src/Interactive/HostProcess/InteractiveHost64.csproj ++++ b/src/Interactive/HostProcess/InteractiveHost64.csproj +@@ -1,7 +1,7 @@ +  + + +- ++ + + false + Exe +diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj +index b9c2de05e63..75953997be3 100644 +--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj ++++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj +@@ -1,7 +1,7 @@ +  + + +- ++ + + Library + Microsoft.VisualStudio.LanguageServices +@@ -178,7 +178,7 @@ + Designer + + +- ++ + + + From a844c058931b2b0ec8c64d976b18c07ca00bc356 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 20 Jan 2022 10:53:11 -0800 Subject: [PATCH 2/4] add new EmptySdk --- .../tarball/content/tools-local/EmptySdk/Sdk/Sdk.props | 7 +++++++ .../tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props new file mode 100644 index 000000000000..ef3547c574d7 --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props @@ -0,0 +1,7 @@ + + + + false + + + diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets new file mode 100644 index 000000000000..8fda6a64c5bb --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets @@ -0,0 +1,9 @@ + + + + + + + + + From e901b1cbabc696cbc592af2f6ce9dd56ad6b89c6 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 31 Jan 2022 12:44:09 -0800 Subject: [PATCH 3/4] define RepositoryEngineeringDir to eliminate the need for roslyn patch --- .../tarball/content/tools-local/EmptySdk/Sdk/Sdk.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props index ef3547c574d7..25bc36ee8a1b 100644 --- a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props @@ -1,7 +1,14 @@ + + + $([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'global.json'))')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) + + false + From aa9072b3dd7b39cddf26e6b6d9a972b783891b3e Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 31 Jan 2022 12:44:35 -0800 Subject: [PATCH 4/4] remove roslyn patch --- ...-missing-imports-during-source-build.patch | 88 ------------------- 1 file changed, 88 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch deleted file mode 100644 index 5580e806899a..000000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-condition-out-missing-imports-during-source-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Wed, 19 Jan 2022 15:58:24 -0800 -Subject: [PATCH] condition out missing imports during source build - -During source-build, the Microsoft.NET.Sdk.WindowsDesktop SDK in these files is -overriden to tools-local/EmptySdk, which has stubbed out targets for Build, -Restore, Pack, etc. This prevents these projects from being built during -source-build and also prevents them from loading the WindowsDesktop SDK, which -is non-free software. Even though these projects won't be built, we still need -to condition out some targets and imports that won't be around during -source-build or due to overriding the WindowsDesktop SDK. - ---- - ...rosoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj | 2 +- - src/Interactive/HostProcess/InteractiveHost32.csproj | 4 ++-- - src/Interactive/HostProcess/InteractiveHost64.csproj | 2 +- - .../Core/Def/Microsoft.VisualStudio.LanguageServices.csproj | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj -index 57f6b2f582f..d41f6b07d3a 100644 ---- a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj -+++ b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj -@@ -68,5 +68,5 @@ - - - -- -+ - -diff --git a/src/Interactive/HostProcess/InteractiveHost32.csproj b/src/Interactive/HostProcess/InteractiveHost32.csproj -index 7b0f0fa7f69..a9d27a745ec 100644 ---- a/src/Interactive/HostProcess/InteractiveHost32.csproj -+++ b/src/Interactive/HostProcess/InteractiveHost32.csproj -@@ -1,7 +1,7 @@ -  - - -- -+ - - true - Exe -@@ -25,7 +25,7 @@ - - Use BuiltProjectOutputGroup as the dependend target to ensure the targets has all dependencies that BuiltProjectOutputGroupOutput would have. - --> -- -+ - - <_PublishProjectOutputGroup Include="$(TargetPath)"> - $(TargetFileName) -diff --git a/src/Interactive/HostProcess/InteractiveHost64.csproj b/src/Interactive/HostProcess/InteractiveHost64.csproj -index 7aa8d1281f6..9ba077901ee 100644 ---- a/src/Interactive/HostProcess/InteractiveHost64.csproj -+++ b/src/Interactive/HostProcess/InteractiveHost64.csproj -@@ -1,7 +1,7 @@ -  - - -- -+ - - false - Exe -diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj -index b9c2de05e63..75953997be3 100644 ---- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj -+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj -@@ -1,7 +1,7 @@ -  - - -- -+ - - Library - Microsoft.VisualStudio.LanguageServices -@@ -178,7 +178,7 @@ - Designer - - -- -+ - - -