diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md
index 8d3c35ad537c0..53ba2a1c1129d 100644
--- a/docs/contributing/Building, Debugging, and Testing on Windows.md
+++ b/docs/contributing/Building, Debugging, and Testing on Windows.md
@@ -18,7 +18,8 @@ The minimal required version of .NET Framework is 4.7.2.
1. [Visual Studio 2019 RC](https://visualstudio.microsoft.com/downloads/#2019rc)
- Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
- Ensure Visual Studio is on Version "RC1" or greater
-1. [.NET Core SDK 2.1.401](https://www.microsoft.com/net/download/core) (the installers are: [Windows x64 installer](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.401/dotnet-sdk-2.1.401-win-x64.exe), [Windows x86 installer](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.401/dotnet-sdk-2.1.401-win-x86.exe))
+ - Ensure "Use Previews" is checked in Tools -> Options -> Projects and Solutions -> .NET Core
+1. [.NET Core SDK 3.0 Preview 3](https://dotnet.microsoft.com/download/dotnet-core/3.0) [Windows x64 installer](https://dotnet.microsoft.com/download/thank-you/dotnet-sdk-3.0.100-preview3-windows-x64-installer)
1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on Windows 7. The download link is under the "upgrading existing Windows PowerShell" heading.
1. Run Restore.cmd
1. Open Roslyn.sln
diff --git a/eng/Versions.props b/eng/Versions.props
index d8de10aaa21bf..944b38c6ceb23 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -67,7 +67,7 @@
14.3.25407-alpha
1.0.0-beta1-63011-01
8.0.0.0-alpha
- 3.1.0-beta1-19127-06
+ 3.1.0-beta1-19164-01
$(RoslynDiagnosticsNugetPackageVersion)
2.0.0
2.1.2
diff --git a/eng/build.ps1 b/eng/build.ps1
index 26305fbc93408..a95024d0f6c28 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -34,6 +34,7 @@ param (
[switch]$bootstrap,
[string]$bootstrapConfiguration = "Release",
[switch][Alias('bl')]$binaryLog,
+ [switch]$buildServerLog,
[switch]$ci,
[switch]$procdump,
[switch]$skipAnalyzers,
@@ -75,6 +76,7 @@ function Print-Usage() {
Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
Write-Host " -deployExtensions Deploy built vsixes (short: -d)"
Write-Host " -binaryLog Create MSBuild binary log (short: -bl)"
+ Write-Host " -buildServerLog Create Roslyn build server log"
Write-Host ""
Write-Host "Actions:"
Write-Host " -restore Restore packages (short: -r)"
@@ -163,6 +165,9 @@ function Process-Arguments() {
if ($ci) {
$script:binaryLog = $true
+ if ($bootstrap) {
+ $script:buildServerLog = $true
+ }
}
if ($test32 -and $test64) {
@@ -205,6 +210,11 @@ function BuildSolution() {
Write-Host "$($solution):"
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
+
+ if ($buildServerLog) {
+ ${env:ROSLYNCOMMANDLINELOGFILE} = Join-Path $LogDir "Build.Server.log"
+ }
+
$projects = Join-Path $RepoRoot $solution
$enableAnalyzers = !$skipAnalyzers
$toolsetBuildProj = InitializeToolset
@@ -223,36 +233,41 @@ function BuildSolution() {
# Workaround for some machines in the AzDO pool not allowing long paths (%5c is msbuild escaped backslash)
$ibcDir = Join-Path $RepoRoot ".o%5c"
- # Setting /p:TreatWarningsAsErrors=true is a workaround for https://github.com/Microsoft/msbuild/issues/3062.
- # We don't pass /warnaserror to msbuild ($warnAsError is set to $false by default above), but set
- # /p:TreatWarningsAsErrors=true so that compiler reported warnings, other than IDE0055 are treated as errors.
- # Warnings reported from other msbuild tasks are not treated as errors for now.
- MSBuild $toolsetBuildProj `
- $bl `
- /p:Configuration=$configuration `
- /p:Projects=$projects `
- /p:RepoRoot=$RepoRoot `
- /p:Restore=$restore `
- /p:Build=$build `
- /p:Test=$testCoreClr `
- /p:Rebuild=$rebuild `
- /p:Pack=$pack `
- /p:Sign=$sign `
- /p:Publish=$publish `
- /p:ContinuousIntegrationBuild=$ci `
- /p:OfficialBuildId=$officialBuildId `
- /p:UseRoslynAnalyzers=$enableAnalyzers `
- /p:BootstrapBuildPath=$bootstrapDir `
- /p:QuietRestore=$quietRestore `
- /p:QuietRestoreBinaryLog=$binaryLog `
- /p:TestTargetFrameworks=$testTargetFrameworks `
- /p:TreatWarningsAsErrors=true `
- /p:VisualStudioIbcSourceBranchName=$ibcSourceBranchName `
- /p:VisualStudioIbcDropId=$ibcDropId `
- /p:EnablePartialNgenOptimization=$applyOptimizationData `
- /p:IbcOptimizationDataDir=$ibcDir `
- $suppressExtensionDeployment `
- @properties
+ try {
+ # Setting /p:TreatWarningsAsErrors=true is a workaround for https://github.com/Microsoft/msbuild/issues/3062.
+ # We don't pass /warnaserror to msbuild ($warnAsError is set to $false by default above), but set
+ # /p:TreatWarningsAsErrors=true so that compiler reported warnings, other than IDE0055 are treated as errors.
+ # Warnings reported from other msbuild tasks are not treated as errors for now.
+ MSBuild $toolsetBuildProj `
+ $bl `
+ /p:Configuration=$configuration `
+ /p:Projects=$projects `
+ /p:RepoRoot=$RepoRoot `
+ /p:Restore=$restore `
+ /p:Build=$build `
+ /p:Test=$testCoreClr `
+ /p:Rebuild=$rebuild `
+ /p:Pack=$pack `
+ /p:Sign=$sign `
+ /p:Publish=$publish `
+ /p:ContinuousIntegrationBuild=$ci `
+ /p:OfficialBuildId=$officialBuildId `
+ /p:UseRoslynAnalyzers=$enableAnalyzers `
+ /p:BootstrapBuildPath=$bootstrapDir `
+ /p:QuietRestore=$quietRestore `
+ /p:QuietRestoreBinaryLog=$binaryLog `
+ /p:TestTargetFrameworks=$testTargetFrameworks `
+ /p:TreatWarningsAsErrors=true `
+ /p:VisualStudioIbcSourceBranchName=$ibcSourceBranchName `
+ /p:VisualStudioIbcDropId=$ibcDropId `
+ /p:EnablePartialNgenOptimization=$applyOptimizationData `
+ /p:IbcOptimizationDataDir=$ibcDir `
+ $suppressExtensionDeployment `
+ @properties
+ }
+ finally {
+ ${env:ROSLYNCOMMANDLINELOGFILE} = $null
+ }
}
@@ -566,6 +581,15 @@ try {
}
}
+ if ($ci) {
+ $global:_DotNetInstallDir = Join-Path $RepoRoot ".dotnet"
+ InstallDotNetSdk $global:_DotNetInstallDir $GlobalJson.tools.dotnet
+
+ # Make sure a 2.1 runtime is installed so we can run our tests. Most of them still
+ # target netcoreapp2.1.
+ InstallDotNetSdk $global:_DotNetInstallDir "2.1.503"
+ }
+
if ($bootstrap) {
$bootstrapDir = Make-BootstrapBuild
}
diff --git a/eng/build.sh b/eng/build.sh
index 03a2b41ab57b4..5809dad6d056f 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -282,6 +282,9 @@ function BuildSolution {
InitializeDotNetCli $restore
+# Make sure we have a 2.1 runtime available for running our tests
+InstallDotNetSdk $_InitializeDotNetCli 2.1.503
+
bootstrap_dir=""
if [[ "$bootstrap" == true ]]; then
MakeBootstrapBuild
diff --git a/global.json b/global.json
index 7f1ae39ba7d9d..e32c6af00a0a0 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "2.1.503",
+ "dotnet": "3.0.100-preview3-010431",
"vs": {
"version": "16.0"
},
diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj
index 461844c3f8792..3d15b93461e7b 100644
--- a/src/Compilers/CSharp/csc/csc.csproj
+++ b/src/Compilers/CSharp/csc/csc.csproj
@@ -20,7 +20,6 @@
-
@@ -44,4 +43,4 @@
-
\ No newline at end of file
+
diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
index 4c4e35770bf0e..13bcbd1a52d86 100644
--- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
+++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
@@ -21,7 +21,7 @@
-
+
@@ -43,4 +43,4 @@
-
\ No newline at end of file
+
diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj
index d2fb413941a40..d255a7e20c5bc 100644
--- a/src/Compilers/VisualBasic/vbc/vbc.csproj
+++ b/src/Compilers/VisualBasic/vbc/vbc.csproj
@@ -19,7 +19,6 @@
-
@@ -43,4 +42,4 @@
-
\ No newline at end of file
+
diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
index e4ec046b04ed1..0e81d015b0d6c 100644
--- a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
+++ b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
@@ -103,10 +103,13 @@ private bool CheckDesktop(TextWriter textWriter, IEnumerable assetRelati
string.Empty,
assetRelativeNames);
+ // Temporarily inserting Microsoft.DiaSymReader.Native.arm.dll while SDK team tracks down why
+ // it's being inserted into destkop builds.
+ // https://github.com/dotnet/cli/issues/10979
allGood &= VerifyVsix(
textWriter,
FindVsix("Roslyn.Compilers.Extension"),
- assetRelativeNames.Concat(new[] { "Roslyn.Compilers.Extension.dll" }));
+ assetRelativeNames.Concat(new[] { "Roslyn.Compilers.Extension.dll", "Microsoft.DiaSymReader.Native.arm.dll" }));
return allGood;
}
@@ -172,6 +175,7 @@ private bool GetPackageAssets(TextWriter textWriter, List packageA
// root as well. That copy is unnecessary.
coreClrAssets.RemoveAll(asset =>
PathComparer.Equals("Microsoft.DiaSymReader.Native.amd64.dll", asset.FileRelativeName) ||
+ PathComparer.Equals("Microsoft.DiaSymReader.Native.arm.dll", asset.FileRelativeName) ||
PathComparer.Equals("Microsoft.DiaSymReader.Native.x86.dll", asset.FileRelativeName));
// Move all of the assets into bincore as that is where the non-MSBuild task assets will go
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListNetCore.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListNetCore.cs
index d913773982016..afccc92325c15 100644
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListNetCore.cs
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListNetCore.cs
@@ -30,7 +30,7 @@ public override void ErrorLevelWarning()
base.ErrorLevelWarning();
}
- [WpfFact, Trait(Traits.Feature, Traits.Features.ErrorList)]
+ [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/34211"), Trait(Traits.Feature, Traits.Features.ErrorList)]
[Trait(Traits.Feature, Traits.Features.NetCore)]
public override void ErrorsDuringMethodBodyEditing()
{
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/Workspace/WorkspacesNetCore.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/Workspace/WorkspacesNetCore.cs
index 37767013da8de..1460f7bfe06fc 100644
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/Workspace/WorkspacesNetCore.cs
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/Workspace/WorkspacesNetCore.cs
@@ -26,7 +26,7 @@ public override void OpenCSharpThenVBSolution()
base.OpenCSharpThenVBSolution();
}
- [WpfFact, Trait(Traits.Feature, Traits.Features.Workspace)]
+ [WpfFact(Skip = "https://github.com/dotnet/cli/issues/10989"), Trait(Traits.Feature, Traits.Features.Workspace)]
[Trait(Traits.Feature, Traits.Features.NetCore)]
public override void MetadataReference()
{