diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md index f7af586365c40..9166216fcd72d 100644 --- a/docs/contributing/Building, Debugging, and Testing on Windows.md +++ b/docs/contributing/Building, Debugging, and Testing on Windows.md @@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2. - Ensure Visual Studio is on Version "16.5" or greater - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features - Restart Visual Studio -1. [.NET Core SDK 3.1](https://dotnet.microsoft.com/download/dotnet-core/3.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.100-windows-x64-installer) +1. [.NET Core SDK 5.0 Preview 7](https://dotnet.microsoft.com/download/dotnet-core/5.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-5.0.100-preview.7-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 earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading. 1. Run Restore.cmd 1. Open Roslyn.sln diff --git a/eng/Versions.props b/eng/Versions.props index 18cfa99214e48..49abd2ca42c91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,7 +175,7 @@ 16.3.43 4.3.0 4.7.0 - 2.0.61 + 2.1.133 0.1.0 4.4.0 4.10.1 diff --git a/global.json b/global.json index 5ecd448f3f983..f7a01f9fd9cac 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,15 @@ { + "sdk": { + "version": "5.0.100-preview.7.20366.6", + "allowPrerelease": true, + "rollForward": "major" + }, "tools": { - "dotnet": "3.1.200", + "dotnet": "5.0.100-preview.7.20366.6", "vs": { - "version": "16.4" + "version": "16.6" }, - "xcopy-msbuild": "16.4.0-alpha" + "xcopy-msbuild": "16.6.5-alpha1" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20365.6" diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs index 51d6ffaa29cbb..4055c85fd62db 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs @@ -7565,7 +7565,7 @@ static void Handler() comp.VerifyDiagnostics(); } - [ConditionalFact(typeof(WindowsOnly), Reason = ConditionalSkipReason.TestExecutionNeedsDesktopTypes)] + [ConditionalFact(typeof(WindowsDesktopOnly), Reason = ConditionalSkipReason.WinRTNeedsWindowsDesktop)] [WorkItem(16962, "https://github.com/dotnet/roslyn/issues/16962")] public void Events_03() { @@ -7612,7 +7612,7 @@ static void Handler() Assert.True(comp2.Compilation.GetMember("C.E").IsWindowsRuntimeEvent); } - [ConditionalFact(typeof(WindowsOnly), Reason = ConditionalSkipReason.TestExecutionNeedsDesktopTypes)] + [ConditionalFact(typeof(WindowsDesktopOnly), Reason = ConditionalSkipReason.WinRTNeedsWindowsDesktop)] [WorkItem(16962, "https://github.com/dotnet/roslyn/issues/16962")] public void Events_04() { diff --git a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj index bb028ce31b4a7..87b7779df1faf 100644 --- a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj @@ -4,11 +4,7 @@ Library Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen - netcoreapp3.1;net472 - - true + net472 diff --git a/src/Compilers/Core/MSBuildTaskTests/DotNetSdkTests.cs b/src/Compilers/Core/MSBuildTaskTests/DotNetSdkTests.cs index 6778751c14f1c..7c1e3361f516c 100644 --- a/src/Compilers/Core/MSBuildTaskTests/DotNetSdkTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/DotNetSdkTests.cs @@ -22,9 +22,13 @@ public void TestSourceLink() var root1 = Path.GetFullPath(ProjectDir.Path + Path.DirectorySeparatorChar); var root2 = Path.GetFullPath(sourcePackageDir.Path + Path.DirectorySeparatorChar); + var root3 = Environment.GetEnvironmentVariable("NUGET_PACKAGES"); + root3 ??= Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages"); + root3 += Path.DirectorySeparatorChar; var escapedRoot1 = root1.Replace(",", ",,").Replace("=", "=="); var escapedRoot2 = root2.Replace(",", ",,").Replace("=", "=="); + var escapedRoot3 = root3.Replace(",", ",,").Replace("=", "=="); var sourceLinkJsonPath = Path.Combine(ObjDir.Path, ProjectName + ".sourcelink.json"); @@ -85,17 +89,19 @@ public void TestSourceLink() }, expectedResults: new[] { - $@"{root2}: /_1/", + $@"{root3}: /_1/", + $@"{root2}: /_2/", $@"{root1}: /_/", $@"{root1}sub1{Path.DirectorySeparatorChar}: /_/sub1/", $@"{root1}sub2{Path.DirectorySeparatorChar}: /_/sub2/", "true", - $@"{escapedRoot2}=/_1/,{escapedRoot1}=/_/,PreviousPathMap", + $@"{escapedRoot3}=/_1/,{escapedRoot2}=/_2/,{escapedRoot1}=/_/,PreviousPathMap", "true" }); AssertEx.AssertEqualToleratingWhitespaceDifferences( - "[/_1/]=[https://raw.githubusercontent.com/Source/Package/*]," + + "[/_1/]=[]," + + "[/_2/]=[https://raw.githubusercontent.com/Source/Package/*]," + "[/_/]=[https://raw.githubusercontent.com/R1/*]," + "[/_/sub1/]=[https://raw.githubusercontent.com/M1/*]," + "[/_/sub2/]=[https://raw.githubusercontent.com/M2/*]", @@ -123,6 +129,7 @@ public void TestSourceLink() }, expectedResults: new[] { + $@"{root3}: {root3}", $@"{root2}: {root2}", $@"{root1}: {root1}", $@"{root1}sub1{Path.DirectorySeparatorChar}: {root1}sub1{Path.DirectorySeparatorChar}", @@ -132,6 +139,7 @@ public void TestSourceLink() }); AssertEx.AssertEqualToleratingWhitespaceDifferences( + $@"[{root3}]=[]," + $@"[{root2}]=[https://raw.githubusercontent.com/Source/Package/*]," + $@"[{root1}]=[https://raw.githubusercontent.com/R1/*]," + $@"[{root1}sub1{Path.DirectorySeparatorChar}]=[https://raw.githubusercontent.com/M1/*]," + @@ -159,6 +167,7 @@ public void TestSourceLink() }, expectedResults: new[] { + $@"{root3}: {root3}", $@"{root2}: {root2}", $@"{root1}: {root1}", $@"{root1}sub1{Path.DirectorySeparatorChar}: {root1}sub1{Path.DirectorySeparatorChar}", @@ -168,6 +177,7 @@ public void TestSourceLink() }); AssertEx.AssertEqualToleratingWhitespaceDifferences( + $@"[{root3}]=[]," + $@"[{root2}]=[https://raw.githubusercontent.com/Source/Package/*]," + $@"[{root1}]=[https://raw.githubusercontent.com/R1/*]," + $@"[{root1}sub1{Path.DirectorySeparatorChar}]=[https://raw.githubusercontent.com/M1/*]," + @@ -195,6 +205,7 @@ public void TestSourceLink() }, expectedResults: new[] { + $@"{root3}: {root3}", $@"{root2}: {root2}", $@"{root1}: {root1}", $@"{root1}sub1{Path.DirectorySeparatorChar}: {root1}sub1{Path.DirectorySeparatorChar}", @@ -204,6 +215,7 @@ public void TestSourceLink() }); AssertEx.AssertEqualToleratingWhitespaceDifferences( + $@"[{root3}]=[]," + $@"[{root2}]=[https://raw.githubusercontent.com/Source/Package/*]," + $@"[{root1}]=[https://raw.githubusercontent.com/R1/*]," + $@"[{root1}sub1{Path.DirectorySeparatorChar}]=[https://raw.githubusercontent.com/M1/*]," + @@ -237,15 +249,17 @@ public void TestSourceLink() }, expectedResults: new[] { - $@"{root1}: /_/", - $@"{root2}: /_1/", + $@"{root3}: /_/", + $@"{root1}: /_1/", + $@"{root2}: /_2/", @"true", - $@"{escapedRoot1}=/_/,{escapedRoot2}=/_1/," + $@"{escapedRoot3}=/_/,{escapedRoot1}=/_1/,{escapedRoot2}=/_2/," }); AssertEx.AssertEqualToleratingWhitespaceDifferences( - $@"[/_/]=[https://raw.githubusercontent.com/R1/*]," + - $@"[/_1/]=[https://raw.githubusercontent.com/Source/Package/*]", + $@"[/_/]=[]," + + $@"[/_1/]=[https://raw.githubusercontent.com/R1/*]," + + $@"[/_2/]=[https://raw.githubusercontent.com/Source/Package/*]", File.ReadAllText(sourceLinkJsonPath)); // No SourceLink package: @@ -275,15 +289,17 @@ public void TestSourceLink() }, expectedResults: new[] { - $@"{root1}: /_/", - $@"{root2}: /_1/", + $@"{root3}: /_/", + $@"{root1}: /_1/", + $@"{root2}: /_2/", @"true", - $@"{escapedRoot1}=/_/,{escapedRoot2}=/_1/," + $@"{escapedRoot3}=/_/,{escapedRoot1}=/_1/,{escapedRoot2}=/_2/," }); AssertEx.AssertEqualToleratingWhitespaceDifferences( - $@"[/_/]=[https://raw.githubusercontent.com/R1/*]," + - $@"[/_1/]=[https://raw.githubusercontent.com/Source/Package/*]", + $@"[/_/]=[]," + + $@"[/_1/]=[https://raw.githubusercontent.com/R1/*]," + + $@"[/_2/]=[https://raw.githubusercontent.com/Source/Package/*]", File.ReadAllText(sourceLinkJsonPath)); } diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdEvents.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdEvents.vb index 6b84e07df34df..2c6bbfc76fd04 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdEvents.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdEvents.vb @@ -455,7 +455,7 @@ End Class ''' I'm assuming this is why the final dev11 impl uses GetOrCreateEventRegistrationTokenTable. ''' - + Public Sub FieldLikeEventSerialization() Dim source1 = diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/WinRTCollectionTests.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/WinRTCollectionTests.vb index f72a7d913127a..08e3fcc1d59d6 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/WinRTCollectionTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/WinRTCollectionTests.vb @@ -51,7 +51,7 @@ End Class]]> comp.AssertNoDiagnostics() End Sub - + Public Sub IVectorProjectionTests() Dim source = @@ -178,7 +178,7 @@ b ]]>.Value) End Sub - + Public Sub IVectorViewProjectionTests() Dim source = @@ -225,7 +225,7 @@ End Class]]> }]]>.Value) End Sub - + Public Sub IVectorLinqQueryTest() Dim source = @@ -287,7 +287,7 @@ End Class ]]>.Value) End Sub - + Public Sub IMapProjectionTests() Dim source = diff --git a/src/Scripting/CSharpTest/ObjectFormatterTests.cs b/src/Scripting/CSharpTest/ObjectFormatterTests.cs index 4c2dceeab72e8..a068567b8fe94 100644 --- a/src/Scripting/CSharpTest/ObjectFormatterTests.cs +++ b/src/Scripting/CSharpTest/ObjectFormatterTests.cs @@ -446,7 +446,7 @@ public void DebuggerProxy_FrameworkTypes_IEnumerable() // the implementation differs between .NET Core and .NET FX if (str.StartsWith("Enumerable")) { - Assert.Equal("Enumerable.RangeIterator { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }", str); + Assert.Equal("Enumerable.RangeIterator(Count = 10)", str); } else { diff --git a/src/Test/Utilities/Portable/Assert/ConditionalFactAttribute.cs b/src/Test/Utilities/Portable/Assert/ConditionalFactAttribute.cs index 1aacf3d62e4ad..4f2fd8df55a11 100644 --- a/src/Test/Utilities/Portable/Assert/ConditionalFactAttribute.cs +++ b/src/Test/Utilities/Portable/Assert/ConditionalFactAttribute.cs @@ -44,6 +44,8 @@ public static class ConditionalSkipReason public const string TestHasWindowsPaths = "Test depends on Windows style paths"; public const string TestExecutionNeedsFusion = "Test depends on desktop fusion loader API"; + public const string WinRTNeedsWindowsDesktop = "WinRT is only supported on Windows desktop"; + /// /// Mono issues around Default Interface Methods ///