diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md index f6ea166e1959b679b76469b7cc89ea24a35c49ab..d83f7ab218862594afcae9a6a437f934f876adfd 100644 --- a/docs/contributing/Building, Debugging, and Testing on Windows.md +++ b/docs/contributing/Building, Debugging, and Testing on Windows.md @@ -19,7 +19,7 @@ The minimal required version of .NET Framework is 4.7.2. - 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 - Ensure "Use Previews" is checked in Tools -> Options -> Projects and Solutions -> .NET Core -1. [.NET Core SDK 3.0 Preview 4](https://dotnet.microsoft.com/download/dotnet-core/3.0) [Windows x64 installer](https://dotnetcli.azureedge.net/dotnet/Sdk/3.0.100-preview4-010963/dotnet-sdk-3.0.100-preview4-010963-win-x64.exe ) +1. [.NET Core SDK 3.0 Preview 6](https://dotnet.microsoft.com/download/dotnet-core/3.0) [Windows x64 installer](https://dotnetcli.azureedge.net/dotnet/Sdk/3.0.100-preview6-011773/dotnet-sdk-3.0.100-preview6-011773-win-x64.exe ) 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 5e331bbb4079dd03154a48998453035ba20c8a58..b801f5ad358c96e5e27e70ea998fc89545f32730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,8 @@ 8.0.0.0-alpha 3.1.0-beta1-19164-01 $(RoslynDiagnosticsNugetPackageVersion) - 3.0.0-preview4-27525-72 - 3.0.0-preview4-27525-72 - 3.0.0-preview4-27525-72 + 3.0.0-preview6-27706-71 + 3.0.0-preview6-27706-71 2.1.2 16.0.1 1.1.0 diff --git a/global.json b/global.json index f5793f91007c1f303d4bdd38e2726553309860f1..b8a97eed5921ff469daa6d0cbdaebd2f62e700b6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100-preview4-010963", + "dotnet": "3.0.100-preview6-011773", "vs": { "version": "16.0" }, diff --git a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj index 6eede0deeb46de6aa926a321b553bd5dda064c91..bc7d8b342bd6132bcfdf58c07662b4be4d9f1611 100644 --- a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests true net472;netcoreapp3.0 - $(RoslynPortableRuntimeIdentifiers) true diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs index c77dd55ef1ac548f3d3946d88c912731c4578cdd..6bab8568882dfef8432523f51ccebdf82de36847 100644 --- a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs +++ b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs @@ -106,13 +106,6 @@ 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", "Microsoft.DiaSymReader.Native.arm.dll" })); return allGood; }