From c878ddfaee8949886da93d57b226c9c4ffc4723d Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Fri, 14 Sep 2018 12:36:26 -0700 Subject: [PATCH] Move to netcoreapp2.1 After working with the CoreClr team it turns out part of our CoreClr flakiness on Linux is due to bugs fixed in netcoreapp2.1. Given that and that our consumers are all on netcoreapp2.1 already I'm moving us to 2.1. --- build/Targets/Imports.targets | 2 +- build/Targets/Packages.props | 2 +- build/Targets/Settings.props | 2 +- build/Targets/Tools.props | 2 +- build/ToolsetPackages/RoslynToolset.csproj | 4 +-- build/scripts/build.ps1 | 6 ++-- build/scripts/tests.sh | 8 ++--- .../InternalsVisibleToAndStrongNameTests.cs | 2 +- src/Compilers/CSharp/csc/csc.csproj | 2 +- .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 +-- .../Server/VBCSCompiler/VBCSCompiler.csproj | 4 +-- .../VBCSCompilerTests/CompilerServerTests.cs | 2 +- .../VBCSCompiler.UnitTests.csproj | 4 +-- .../Shared/CoreClrAnalyzerAssemblyLoader.cs | 2 +- .../InternalsVisibleToAndStrongNameTests.vb | 2 +- .../Test/Emit/Emit/FieldInitializerTests.vb | 2 +- ...Analysis.VisualBasic.Emit.UnitTests.vbproj | 2 +- ...ysis.VisualBasic.Semantic.UnitTests.vbproj | 2 +- src/Compilers/VisualBasic/vbc/vbc.csproj | 2 +- src/Interactive/csi/csi.csproj | 4 +-- src/Interactive/vbi/vbi.vbproj | 4 +-- ...Microsoft.NETCore.Compilers.Package.csproj | 32 +++++++++---------- .../Portable/Assert/UseCultureAttribute.cs | 6 ++-- .../Portable/Compilation/RuntimeUtilities.cs | 4 +-- .../CoreClr/CoreCLRRuntimeEnvironment.cs | 2 +- .../CoreCLRRuntimeEnvironmentFactory.cs | 2 +- .../CoreClr/SharedConsoleOutWriter.cs | 2 +- .../CoreClr/TestExecutionLoadContext.cs | 2 +- .../Portable/Platform/Custom/OSVersion.cs | 2 +- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 2 +- .../CompilerBenchmarks.csproj | 2 +- src/Tools/ILAsm/IlAsmDeploy.csproj | 2 +- .../CompilersBoundTreeGenerator.csproj | 2 +- .../CSharpErrorFactsGenerator.csproj | 2 +- .../CSharpSyntaxGenerator.csproj | 2 +- .../VisualBasicErrorFactsGenerator.vbproj | 2 +- .../RedNodes/RedNodeWriter.vb | 5 ++- .../Util/WriteCsvNames.vb | 4 +-- .../VisualBasicSyntaxGenerator.vbproj | 2 +- .../Resources/NetCoreApp2/Project.csproj | 2 +- .../NetCoreApp2AndLibrary/Project.csproj | 2 +- .../NetCoreApp2AndTwoLibraries/Project.csproj | 2 +- .../Resources/NetCoreMultiTFM/Project.csproj | 2 +- .../Project.csproj | 2 +- .../Project.csproj | 2 +- 45 files changed, 77 insertions(+), 76 deletions(-) diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets index 9c4b38bd47c1a..5ab8a5ff46793 100644 --- a/build/Targets/Imports.targets +++ b/build/Targets/Imports.targets @@ -15,7 +15,7 @@ - false + false $(ArtifactsConfigurationDir)DevDivPackages\Roslyn\ diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props index 53cabf992a629..d840a3b6e5d83 100644 --- a/build/Targets/Packages.props +++ b/build/Targets/Packages.props @@ -74,7 +74,7 @@ 2.9.0-beta7-63018-03 5.0.0 2.0.0 - 2.0.0 + 2.1.0 1.0.1 2.0.0 1.1.0 diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props index ab9881379ff1c..f3c44d9bf97c2 100644 --- a/build/Targets/Settings.props +++ b/build/Targets/Settings.props @@ -27,7 +27,7 @@ true $(RepoRoot)build\ToolsetPackages\ - net46;netcoreapp2.0 + net46;netcoreapp2.1 win;win-x64;linux-x64;osx-x64 win win-x86 diff --git a/build/Targets/Tools.props b/build/Targets/Tools.props index 3060a30a11966..745e2b3b901e9 100644 --- a/build/Targets/Tools.props +++ b/build/Targets/Tools.props @@ -7,7 +7,7 @@ - 2.0.7 + 2.1.3 - net46;netcoreapp2.0 + net46;netcoreapp2.1 @@ -36,7 +36,7 @@ - + diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1 index f891b3975c37f..f917bf039df80 100644 --- a/build/scripts/build.ps1 +++ b/build/scripts/build.ps1 @@ -344,10 +344,11 @@ function Test-XUnitCoreClr() { Exec-Console $dotnet "publish src\Tools\ILAsm --no-restore --runtime win-x64 --self-contained -o $ilasmDir" $unitDir = Join-Path $configDir "UnitTests" - $tf = "netcoreapp2.0" + $tf = "netcoreapp2.1" $xunitResultDir = Join-Path $unitDir "xUnitResults" Create-Directory $xunitResultDir - $xunitConsole = Join-Path (Get-PackageDir "xunit.runner.console") "tools\$tf\xunit.console.dll" + $xunitConsole = Join-Path (Get-PackageDir "xunit.runner.console") "tools\netcoreapp2.0\xunit.console.dll" + $runtimeVersion = Get-ToolVersion "dotnetRuntime" $dlls = @() $allGood = $true @@ -358,6 +359,7 @@ function Test-XUnitCoreClr() { $dllPath = Join-Path $testDir $dllName $args = "exec" + $args += " --fx-version $runtimeVersion" $args += " --depsfile " + [IO.Path]::ChangeExtension($dllPath, ".deps.json") $args += " --runtimeconfig " + [IO.Path]::ChangeExtension($dllPath, ".runtimeconfig.json") $args += " $xunitConsole" diff --git a/build/scripts/tests.sh b/build/scripts/tests.sh index 6f101c3f0208f..5988ef0dce9b0 100755 --- a/build/scripts/tests.sh +++ b/build/scripts/tests.sh @@ -17,10 +17,11 @@ unittest_dir="${binaries_path}"/"${build_configuration}"/UnitTests log_dir="${binaries_path}"/"${build_configuration}"/xUnitResults nuget_dir="${HOME}"/.nuget/packages xunit_console_version="$(get_package_version xunitrunnerconsole)" +dotnet_runtime_version="$(get_tool_version dotnetRuntime)" if [[ "${runtime}" == "dotnet" ]]; then - target_framework=netcoreapp2.0 - file_list=( "${unittest_dir}"/*/netcoreapp2.0/*.UnitTests.dll ) + target_framework=netcoreapp2.1 + file_list=( "${unittest_dir}"/*/netcoreapp2.1/*.UnitTests.dll ) xunit_console="${nuget_dir}"/xunit.runner.console/"${xunit_console_version}"/tools/${target_framework}/xunit.console.dll elif [[ "${runtime}" == "mono" ]]; then file_list=( @@ -68,8 +69,6 @@ do echo Running "${runtime} ${file_name[@]}" if [[ "${runtime}" == "dotnet" ]]; then - runner="dotnet exec --depsfile ${deps_json} --runtimeconfig ${runtimeconfig_json}" - # Disable the VB Semantic tests while we investigate the core dump issue # https://github.com/dotnet/roslyn/issues/29660 if [[ "${file_name[@]}" == *'Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.dll' ]] @@ -77,6 +76,7 @@ do echo "Skipping ${file_name[@]}" continue fi + runner="dotnet exec --fx-version ${dotnet_runtime_version} --depsfile ${deps_json} --runtimeconfig ${runtimeconfig_json}" elif [[ "${runtime}" == "mono" ]]; then runner=mono fi diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs b/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs index e5cfae55aed38..4c96ca3278e3c 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs @@ -1,5 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if !NETCOREAPP2_0 +#if !NETCOREAPP2_1 using System; using System.Collections.Immutable; using System.IO; diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj index 1a6e8f209e451..81163b5895619 100644 --- a/src/Compilers/CSharp/csc/csc.csproj +++ b/src/Compilers/CSharp/csc/csc.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj index be5e8f83d6de2..87561dae688b0 100644 --- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj +++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj index 7bf11229fc40d..70a647b44b942 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs b/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs index c47beab41c62e..984d6fbc2c47c 100644 --- a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs @@ -101,7 +101,7 @@ private static void CheckForBadShared(List arguments) private static void ReferenceNetstandardDllIfCoreClr(TempDirectory currentDirectory, List arguments) { -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 var filePath = Path.Combine(currentDirectory.Path, "netstandard.dll"); File.WriteAllBytes(filePath, TestResources.NetFX.netstandard20.netstandard); arguments.Add("/nostdlib"); diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj index 6c5905b0ecf26..e25cb2de66430 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs index 5c37cd8e26e5c..2ecb0a6922862 100644 --- a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs +++ b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP1_1 || NETCOREAPP2_0 +#if NETCOREAPP1_1 || NETCOREAPP2_1 using System.Diagnostics; using System.Reflection; diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb index 8b40932b0684d..b723a5431a5b7 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb @@ -1,5 +1,5 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#If NET46 +#If NOT NETCOREAPP2_1 Imports System.Collections.Immutable Imports System.IO diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb index 073f1675b5e76..e0a7a37806c21 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb @@ -583,7 +583,7 @@ BC30424: Constants must be of an intrinsic or enumerated type, not a class, stru ) End Sub -#If NET46 Then +#If NOT NETCOREAPP2_1 Then Public Sub ChrChrWAscAscWAreConst() Dim source = diff --git a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj index 34591319e8380..eea96a57658fb 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj @@ -13,7 +13,7 @@ https://github.com/dotnet/sdk/pull/2117 --> $(FinalDefineConstants),NET46=-1 - $(FinalDefineConstants),NETCOREAPP2_0=-1 + $(FinalDefineConstants),NETCOREAPP2_1=-1 diff --git a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj index 009b788e8d201..1dd4cec6a4210 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj @@ -21,7 +21,7 @@ - + diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj index 42d7dd4c426cb..765a2dc4bd84c 100644 --- a/src/Compilers/VisualBasic/vbc/vbc.csproj +++ b/src/Compilers/VisualBasic/vbc/vbc.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj index c8c99dc6c7448..9e76c2ee297a0 100644 --- a/src/Interactive/csi/csi.csproj +++ b/src/Interactive/csi/csi.csproj @@ -24,11 +24,11 @@ - + csi.rsp PreserveNewest - + csi.rsp PreserveNewest diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj index 693973349cbc4..5b3fedd8dfe51 100644 --- a/src/Interactive/vbi/vbi.vbproj +++ b/src/Interactive/vbi/vbi.vbproj @@ -25,11 +25,11 @@ - + vbi.rsp PreserveNewest - + vbi.rsp PreserveNewest diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj index a06781467ac39..d4a3f5b2b49eb 100644 --- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj +++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 Custom true @@ -38,10 +38,10 @@ <_File Include="$(MSBuildProjectDirectory)\build\**" TargetDir="build" /> <_File Include="$(MSBuildProjectDirectory)\tools\bincore\*.cmd" TargetDir="tools\bincore" /> - <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\*.targets" TargetDir="tools" /> - <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" /> - <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" /> - <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\runtimes\**\*.*" TargetDir="tools\runtimes" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\*.targets" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\runtimes\**\*.*" TargetDir="tools\runtimes" /> <_File Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.CodeAnalysis.dll" TargetDir="tools\bincore" /> <_File Include="$(_Dlls)Microsoft.CodeAnalysis\**\Microsoft.CodeAnalysis.resources.dll" TargetDir="tools\bincore" /> @@ -52,23 +52,23 @@ <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\Microsoft.CodeAnalysis.VisualBasic.dll" TargetDir="tools\bincore" /> <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.dll" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.deps.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.dll" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.deps.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.dll" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)csc\netcoreapp2.0\publish\System.*.dll" TargetDir="tools\bincore" /> - <_File Include="$(_Exes)csc\netcoreapp2.0\publish\runtimes\**" TargetDir="tools\bincore\runtimes" /> + <_File Include="$(_Exes)csc\netcoreapp2.1\publish\System.*.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.1\publish\runtimes\**" TargetDir="tools\bincore\runtimes" /> diff --git a/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs b/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs index 7ee43bdde3179..e4a2177c5d8de 100644 --- a/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs +++ b/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs @@ -54,7 +54,7 @@ public UseCultureAttribute(string culture, string uiCulture) #if NET46 _culture = new Lazy(() => new CultureInfo(culture, useUserOverride: false)); _uiCulture = new Lazy(() => new CultureInfo(uiCulture, useUserOverride: false)); -#elif NETCOREAPP2_0 +#elif NETCOREAPP2_1 _culture = new Lazy(() => new CultureInfo(culture)); _uiCulture = new Lazy(() => new CultureInfo(uiCulture)); #else @@ -83,7 +83,7 @@ public override void Before(MethodInfo methodUnderTest) _originalCulture = CultureInfo.CurrentCulture; _originalUICulture = CultureInfo.CurrentUICulture; -#if NET46 || NETCOREAPP2_0 +#if NET46 || NETCOREAPP2_1 CultureInfo.CurrentCulture = Culture; CultureInfo.CurrentUICulture = UICulture; @@ -103,7 +103,7 @@ public override void Before(MethodInfo methodUnderTest) /// The method under test public override void After(MethodInfo methodUnderTest) { -#if NET46 || NETCOREAPP2_0 +#if NET46 || NETCOREAPP2_1 CultureInfo.CurrentCulture = _originalCulture; CultureInfo.CurrentUICulture = _originalUICulture; diff --git a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs index 0f73a752dab17..b34ac0b2867b0 100644 --- a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs +++ b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs @@ -35,7 +35,7 @@ internal static IRuntimeEnvironmentFactory GetRuntimeEnvironmentFactory() { #if NET46 return new Roslyn.Test.Utilities.Desktop.DesktopRuntimeEnvironmentFactory(); -#elif NETCOREAPP2_0 +#elif NETCOREAPP2_1 return new Roslyn.Test.Utilities.CoreClr.CoreCLRRuntimeEnvironmentFactory(); #elif NETSTANDARD1_3 throw new PlatformNotSupportedException(); @@ -58,7 +58,7 @@ internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader() /// internal static string GetAssemblyLocation(Type type) { -#if NET46 || NETCOREAPP2_0 +#if NET46 || NETCOREAPP2_1 return type.GetTypeInfo().Assembly.Location; #elif NETSTANDARD1_3 throw new PlatformNotSupportedException(); diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs index a5f2bda60554d..327ef6163ea64 100644 --- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs +++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs @@ -1,5 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System; using System.Linq; using System.Collections.Generic; diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs index 8a196fc9d79bb..b5b28143a7da8 100644 --- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs +++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System; using System.Collections.Generic; diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs index 4aa9048ad5583..055dc48bac5bb 100644 --- a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs +++ b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System; using System.IO; diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs index 1d0504db78066..09f34764b3402 100644 --- a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs +++ b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs @@ -1,5 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs b/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs index 2b1c93a4653e9..a01c4d2b60956 100644 --- a/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs +++ b/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs @@ -12,7 +12,7 @@ public static class OSVersion /// True when the operating system is at least Windows version 8 /// public static bool IsWin8 => -#if NET46 || NETCOREAPP2_0 +#if NET46 || NETCOREAPP2_1 System.Environment.OSVersion.Version.Build >= 9200; #else throw new PlatformNotSupportedException(); diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index c4f070ae9c556..9ff59a4441133 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -444,7 +444,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter, RoslynProjectData data case "net46": case "netstandard1.3": case "netcoreapp1.1": - case "netcoreapp2.0": + case "netcoreapp2.1": case "$(RoslynPortableTargetFrameworks)": break; default: diff --git a/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj b/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj index 60724f6e0282a..9533be52272d3 100644 --- a/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj +++ b/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj @@ -4,7 +4,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 false diff --git a/src/Tools/ILAsm/IlAsmDeploy.csproj b/src/Tools/ILAsm/IlAsmDeploy.csproj index a95683aac28fa..60ae51cbce0d8 100644 --- a/src/Tools/ILAsm/IlAsmDeploy.csproj +++ b/src/Tools/ILAsm/IlAsmDeploy.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 $(RoslynPortableRuntimeIdentifiers) Exe