diff --git a/eng/Versions.props b/eng/Versions.props
index 4a6787560d7737935ad52226735a2f7dd78ce3d6..a6f69b3cdd0c1e3afa3e3c803b028c822ff41fcd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -70,7 +70,6 @@
$(CodeStyleAnalyzerVersion)
3.3.0
$(RoslynDiagnosticsNugetPackageVersion)
- 1.0.31
4.3.0
1.0.339
0.8.31-beta
@@ -189,6 +188,7 @@
0.0.4
1.0.21
4.5.1
+ 1.0.31
4.7.0
0.3.0-alpha.19577.1
4.5.0
@@ -197,6 +197,7 @@
4.3.0
4.5.1
4.5.4
+ 4.7.1
4.7.0
4.3.0
4.5.1
diff --git a/eng/build.ps1 b/eng/build.ps1
index c547d7860e106650a14294c5525b7022382332a4..f0ad42db407d3f8cd185e00ad4e07dfb5b5e44be 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -199,8 +199,7 @@ function Process-Arguments() {
}
function BuildSolution() {
- # Roslyn.sln can't be built with dotnet due to WPF and VSIX build task dependencies
- $solution = if ($msbuildEngine -eq 'dotnet') { "Compilers.sln" } else { "Roslyn.sln" }
+ $solution = "Roslyn.sln"
Write-Host "$($solution):"
diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
index c0cd2b88c4065586fee767ace3eceb2853dee371..1724db82e120830d712865b20a0a99e6325ae4b4 100644
--- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
+++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
@@ -4,7 +4,7 @@
<_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net472\Microsoft.DotNet.NuGetRepack.Tasks.dll
- <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\netcoreapp3.1\Microsoft.DotNet.NuGetRepack.Tasks.dll
+ <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\netcoreapp2.1\Microsoft.DotNet.NuGetRepack.Tasks.dll
diff --git a/src/Setup/Installer/Installer.Package.csproj b/src/Setup/Installer/Installer.Package.csproj
index 8351595e09c30deff9d9d3896eff329491f8f45d..72b14ac7b1ed534e47cdd21af18d333c3d332988 100644
--- a/src/Setup/Installer/Installer.Package.csproj
+++ b/src/Setup/Installer/Installer.Package.csproj
@@ -24,7 +24,7 @@
DependsOnTargets="_CalculateInputsOutputs;ResolveProjectReferences"
Inputs="$(MSBuildAllProjects);$(_DeploymentVsixPath)"
Outputs="$(_InstallerFilePath)"
- Condition="'$(DotNetBuildFromSource)' != 'true'">
+ Condition="'$(DotNetBuildFromSource)' != 'true' and '$(MSBuildRuntimeType)' != 'Core'">
<_Files Include="$(MSBuildProjectDirectory)\tools\*.*" TargetDir="tools"/>
<_Files Include="$(MSBuildProjectDirectory)\scripts\*.*" TargetDir=""/>
diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj
index 67cf855e876c0314cebdc17886b8c73fa3a977c7..192c9b28895ad6987d34abccb3e79708635b4058 100644
--- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj
+++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj
@@ -6,6 +6,7 @@
net472
true
Roslyn.VisualStudio.DiagnosticsWindow
+ true
true
@@ -58,6 +59,7 @@
+