Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add target framework 'netcoreapp3.0' or replace target framework 'netcoreapp2.1' with 'netcoreapp3.0' when adding is not possible #37823

Closed
wants to merge 110 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
c3114ea
Add target framework 'netcoreapp3.0' or replace target framework 'net…
Aug 8, 2019
94f0c80
Update default naming styles to support 'private protected'
sharwell Jun 11, 2019
296c43f
Initial implementation where checks are made public. Information will…
ryzngard Jul 17, 2019
4ae908e
Hook up maxlangver for CPS
ryzngard Jul 18, 2019
65d9410
Handle speculation for AsNewClause by generating an EqualsValue node
JoeRobich Jul 26, 2019
32129fa
Introduce IDisposable to ArrayBuilder.
petrroll Jul 29, 2019
37d6d43
Move more instances to IDisposable ArrayBuilder.
petrroll Jul 30, 2019
d2dac76
Cleanup.
petrroll Jul 30, 2019
7551aa2
Add test
ryzngard Jul 30, 2019
bb610ab
Update based on PR feedback
JoeRobich Aug 1, 2019
9ac9732
UniqueItem is not triggered when completion is initiated by backspace
ivanbasov Aug 3, 2019
9e96a64
Explicitly call BindExpression in GetSpeculativeSymbolInfo, instead o…
333fred Aug 5, 2019
f18d2bb
For tests, always allow parse option changes
ryzngard Aug 5, 2019
306282a
Reworked IDisposability of pool projects -> explicit disposer.
petrroll Aug 5, 2019
67dc458
Streamlined PooledDisposer.
petrroll Aug 5, 2019
b75c4e9
completion test
ivanbasov Aug 5, 2019
6708703
Revert using Disposer in Compiler files.
petrroll Aug 5, 2019
827cacb
Fix typo.
petrroll Aug 5, 2019
495cf24
Move RefactoringHelper to pooled obj. disposer.
petrroll Aug 5, 2019
a200fcd
PR feedback
ryzngard Aug 6, 2019
618e239
Remove module scope from NullableContextAttribute
roji Aug 6, 2019
ac47ec0
Publish Ngen logs separately
jaredpar Aug 6, 2019
54da3f2
Fix our MSB3270 warnings
jaredpar Jul 31, 2019
74ae8ab
Respond to PR feedback
jaredpar Aug 1, 2019
fcbf72c
Fix a double include of a binary
jaredpar Aug 1, 2019
dfa15dd
Skip tests requiring legacy EditorConfig
JoeRobich Aug 6, 2019
72553fe
Deduplicate test info.
333fred Aug 6, 2019
7ca28aa
Get newNameType node from SpeculativeModel
JoeRobich Aug 6, 2019
36c0468
Request reviews from the VS for Mac team if we touch our WPF layer
jasonmalinowski Aug 6, 2019
9328e74
Switch from *.groovy to *.yml
jasonmalinowski Aug 6, 2019
ac783d1
Update current top-level infrastructure folders
jasonmalinowski Aug 6, 2019
d5b7241
Add handler and client for syntax classifications over LSP.
dibarbet Jul 29, 2019
6d40a0e
Fix property reference
ryzngard Aug 7, 2019
812fdd5
Update src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompl…
ivanbasov Aug 7, 2019
b597241
Update src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompl…
ivanbasov Aug 7, 2019
2263eba
code review feedback
ivanbasov Aug 7, 2019
d555df7
Fix pre-release version that got out of sync.
JoeRobich Aug 7, 2019
0cb99c2
Fix namespace incremental parsing bug (#37770)
agocke Aug 7, 2019
2addc36
Disable interprocedural dataflow analysis for DisposableFieldsShouldB…
mavasani Aug 7, 2019
d9c2fa9
Check experimentation service for syntactic LSP.
dibarbet Aug 7, 2019
c99171e
Update ownership of CompilerGeneratorTools to the compiler team
jasonmalinowski Aug 7, 2019
73d9761
Fix "fixed" keyword formatting (#37031)
MykolaBalakin Aug 8, 2019
86ea5fd
Add ref, qualified generic name detection, and tuple handling for Spe…
pawchen Aug 8, 2019
2e45b4e
Remove inaccessible attributes when generating from the navigation bar
jasonmalinowski Aug 8, 2019
26c27e9
Remove unused usings
jasonmalinowski Aug 7, 2019
4d4de38
Fix only attributes can cause refactorings crash (#37837).
petrroll Aug 8, 2019
51a8527
PR feedback.
petrroll Aug 8, 2019
467d1dc
PR feedback cleanup.
petrroll Aug 8, 2019
31453b5
Fix using node instead of proper root in RefaHelperService.
petrroll Aug 8, 2019
4f2f8ef
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 3, 2019
4aff72f
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 4, 2019
66ec9af
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 5, 2019
aef644f
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 8, 2019
a904da3
React to https://github.com/dotnet/arcade/pull/3120
agocke Aug 7, 2019
9ba41e0
Convert the type inferrer tests to be Theories
jasonmalinowski Aug 8, 2019
2d814d9
Move call to RegisterDocumentOptionsProvider to TestWorkspace constru…
jasonmalinowski Aug 8, 2019
0425771
Remove flighting and have a checkbox opt out of new .editorconfig sup…
jasonmalinowski Aug 7, 2019
ffbf9a7
Find annotated nodes in speculativeModel tree to fix Rename speculation
JoeRobich Aug 8, 2019
3f1b0b4
Update the simplification engine to remove ?s in #nullable disable
jasonmalinowski Aug 7, 2019
704c217
Enhance type inferrence of reference types before a ??
jasonmalinowski Aug 7, 2019
87a75db
Add some handling around nullability and error types
jasonmalinowski Aug 9, 2019
615a2f1
completion unit test for reduce extension method does not check type …
ivanbasov Aug 9, 2019
0f23853
don't crash Vs because OOP lost its connection
heejaechang Aug 9, 2019
055778f
Move poolableObjs changes to IDE only.
petrroll Aug 9, 2019
b846a0e
Cleanup.
petrroll Aug 9, 2019
52dd590
Make PooledHashSet and StringBuilder partial.
petrroll Aug 9, 2019
3ab40ae
Add copyright + extracted common disposer.
petrroll Aug 9, 2019
a1735ec
Move to new ilasm version
jaredpar Aug 9, 2019
d9a56f4
Fix up some test failures
jaredpar Aug 9, 2019
fbad8c5
Create a UIContext triggered by projects in the VisualStudioWorkspace
jasonmalinowski Aug 6, 2019
eadfdfe
Update CSharpCompletionCommandHandlerTests.vb
ivanbasov Aug 9, 2019
2cd6ee0
More work
jaredpar Aug 9, 2019
a71fca0
Unskip test that was skipped during nullable prototype work
jasonmalinowski Aug 9, 2019
7131081
Fix version typos
jaredpar Aug 9, 2019
2faf957
Fix and unskip nullable-reference-type related project upgrade test
jasonmalinowski Aug 9, 2019
7ee2b0f
Add capability check before requesting classifications.
dibarbet Aug 7, 2019
0388c83
Fix casing errors
jaredpar Aug 10, 2019
ab13ada
Support top-level nullability in Use Explicit Type
jasonmalinowski Aug 10, 2019
a07ae0e
Implement type syntax generation for nullable arrays
jasonmalinowski Aug 10, 2019
be00d59
Update package heuristic to include other invalid directories.
dibarbet Aug 10, 2019
d31ba35
Issue #37030: Enum member formatting should follow csharp_space_aroun…
phizch Aug 11, 2019
41d36b0
Tests for Issue #37030: Enum member formatting should follow csharp_s…
phizch Aug 11, 2019
5bb4b24
LOC CHECKIN | dotnet/roslyn master | 20190812
v-zbsail Aug 12, 2019
2e0584e
Include more projects
jaredpar Aug 12, 2019
c497064
Update src/Test/Utilities/Portable/Metadata/IlasmUtilities.cs
jaredpar Aug 12, 2019
6b3552a
Use destkop ilasm
jaredpar Aug 12, 2019
db83026
Update partial load dialog string to better match task center.
dibarbet Aug 12, 2019
63d51ad
added api usage telemetry reporter
heejaechang Aug 12, 2019
4b0a64a
Remove unused MSBuild property
jaredpar Aug 12, 2019
1053654
use xml documment id as telemetry data rather than custom format
heejaechang Aug 12, 2019
b7dd327
add constructor to one of apis to track
heejaechang Aug 12, 2019
a8a814f
Update src/Workspaces/Remote/Core/Telemetry/ApiUsageIncrementalAnalyz…
heejaechang Aug 13, 2019
84c655d
Update src/Workspaces/Remote/Core/Telemetry/ApiUsageIncrementalAnalyz…
heejaechang Aug 13, 2019
66e1877
changed our task center status bar to say "low priority background pr…
heejaechang Aug 13, 2019
445e758
removed duplicated code
heejaechang Aug 13, 2019
8dad52e
Update MS.CA.EditorFeatures2.UnitTests splitting
jaredpar Aug 13, 2019
6bcc107
Update src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.Inc…
heejaechang Aug 13, 2019
61f7977
PR feedbacks
heejaechang Aug 13, 2019
b40e11c
Update src/Features/Core/Portable/SolutionCrawler/SolutionCrawlerProg…
heejaechang Aug 13, 2019
d019f5f
PR feedback.
heejaechang Aug 13, 2019
318bff9
comment update
heejaechang Aug 13, 2019
7275e0a
Add nullable API annotations to Project/ProjectInfo and friends
jasonmalinowski Aug 9, 2019
b8543d2
more comment
heejaechang Aug 13, 2019
88d6dbf
put some API back since it broke partner's IVT
heejaechang Aug 13, 2019
ee95e73
more comments!
heejaechang Aug 13, 2019
af04182
Improve documentation comments around GetCompilationAsync
jasonmalinowski Aug 13, 2019
98d9a87
filter out cross language p2p metadata symbol
heejaechang Aug 13, 2019
cef77b3
add symbol equality comparer explicitly to ignore nullability
heejaechang Aug 13, 2019
c6f9895
Rebase onto 'master'
Aug 14, 2019
76dab70
Fix conflicts with 'master'
Aug 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/infrastructure/cross-platform.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The script will install .NET Core to `.dotnet` directory if it is not found on `

## Using the compiler

After building, there will be a `csc` in the `artifacts/bin/csc/Debug/netcoreapp2.1` and `artifacts/bin/csc/Debug/net472` directories. Use the former to run on .NET Core and the latter on Mono.
After building, there will be a `csc` in the `artifacts/bin/csc/Debug/netcoreapp2.1` and `artifacts/bin/csc/Debug/netcoreapp3.0` and `artifacts/bin/csc/Debug/net472` directories. Use the former to run on .NET Core and the latter on Mono.

### Running `csc.exe` on Mono

Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<MicrosoftNetCoreAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</MicrosoftNetCoreAnalyzersVersion>
<MicrosoftNetCoreILAsmVersion>3.0.0-preview6-27721-71</MicrosoftNetCoreILAsmVersion>
<MicrosoftNetCoreILDasmVersion>3.0.0-preview6-27721-71</MicrosoftNetCoreILDasmVersion>
<MicrosoftNETCorePlatformsVersion>2.1.2</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19362.9</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETTestSdkVersion>16.0.1</MicrosoftNETTestSdkVersion>
<MicrosoftNETCoreTestHostVersion>1.1.0</MicrosoftNETCoreTestHostVersion>
<MicrosoftNetFX20Version>1.0.3</MicrosoftNetFX20Version>
Expand Down
5 changes: 2 additions & 3 deletions eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,8 @@ try {
$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"
# Make sure a 3.0 runtime is installed so we can run our tests.
InstallDotNetSdk $global:_DotNetInstallDir "3.0.100-preview7-012821"
}

try
Expand Down
2 changes: 1 addition & 1 deletion eng/common/PublishToPackageFeed.proj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)DefaultVersions.props" Condition="Exists('$(MSBuildThisFileDirectory)DefaultVersions.props')" />
Expand Down
2 changes: 1 addition & 1 deletion eng/common/PublishToSymbolServers.proj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)microsoft.symboluploader.build.task\$(SymbolUploaderVersion)\build\PublishSymbols.targets" />
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SigningValidation.proj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}

$buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" }
$buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp3.0" }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="netcoreapp2.1"
_InitializeBuildToolFramework="netcoreapp3.0"
}

function GetNuGetPackageCachePath {
Expand Down
6 changes: 3 additions & 3 deletions eng/targets/Settings.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir>

<RoslynPortableTargetFrameworks>net472;netcoreapp2.1</RoslynPortableTargetFrameworks>
<RoslynPortableRuntimeIdentifiers>win;win-x64;linux-x64;osx-x64</RoslynPortableRuntimeIdentifiers>
<RoslynPortableTargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</RoslynPortableTargetFrameworks>
<RoslynPortableRuntimeIdentifiers>win;win-x64;linux-x64;osx-x64;freebsd-x64</RoslynPortableRuntimeIdentifiers>
<RoslynEnforceCodeStyle Condition="'$(ContinuousIntegrationBuild)' != 'true'">true</RoslynEnforceCodeStyle>
<UseSharedCompilation>true</UseSharedCompilation>

Expand Down Expand Up @@ -66,7 +66,7 @@
These may be overriden by projects that need to be skipped.
-->
<TestTargetFrameworks Condition="'$(TestRuntime)' == 'Mono'">net46;net472</TestTargetFrameworks>
<TestTargetFrameworks Condition="'$(TestRuntime)' == 'Core'">netcoreapp2.1</TestTargetFrameworks>
<TestTargetFrameworks Condition="'$(TestRuntime)' == 'Core'">netcoreapp2.1;netcoreapp3.0</TestTargetFrameworks>

<XUnitDesktopSettingsFile>$(MSBuildThisFileDirectory)..\config\xunit.runner.json</XUnitDesktopSettingsFile>
<XUnitCoreSettingsFile>$(MSBuildThisFileDirectory)..\config\xunit.runner.json</XUnitCoreSettingsFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5813,7 +5813,7 @@ public void BinaryFileErrorTest()
CleanupAllGeneratedFiles(binaryPath);
}

#if !NETCOREAPP2_1
#if !NETCOREAPP2_1 && !NETCOREAPP3_0
[WorkItem(530221, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530221")]
[WorkItem(5660, "https://github.com/dotnet/roslyn/issues/5660")]
[ConditionalFact(typeof(WindowsOnly), typeof(IsEnglishLocal))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2268,7 +2268,7 @@ internal void Goo()
}
}

#if !NETCOREAPP2_1
#if !NETCOREAPP2_1 && !NETCOREAPP3_0
[ConditionalFact(typeof(WindowsDesktopOnly), Reason = ConditionalSkipReason.TestExecutionNeedsDesktopTypes)]
[WorkItem(399, "https://github.com/dotnet/roslyn/issues/399")]
public void Bug399()
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Test/WinRT/PEParameterSymbolTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols
{
public class PEParameterSymbolTests : CSharpTestBase
{
#if !NETCOREAPP2_1
#if !NETCOREAPP2_1 && !NETCOREAPP3_0
[Fact]
public void NoParameterNames()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/csc/csc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Shared\RuntimeHostInfo.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Xunit;

// The ShadowCopyAnalyzerAssemblyLoader type is only defined for the below platforms
#if NET472 || NETCOREAPP2_1
#if NET472 || NETCOREAPP2_1 || NETCOREAPP3_0

namespace Microsoft.CodeAnalysis.UnitTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" ExcludeAssets="Runtime" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Microsoft.Build.Tasks.CodeAnalysis.UnitTests" />
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<ProjectReference Include="..\..\Core\Portable\Microsoft.CodeAnalysis.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'netcoreapp3.0'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<ProjectReference Include="..\..\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
<Reference Include="System.Xml" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
<Reference Include="System" Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'netcoreapp3.0'" />
<Reference Include="System.Xml" Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'netcoreapp3.0'" />
<PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
Original file line number Diff line number Diff line change
@@ -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_1
#if NETCOREAPP2_1 || NETCOREAPP3_0

using System.Diagnostics;
using System.Reflection;
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Shared/NamedPipeUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ internal static PipeSecurity CreatePipeSecurity()
return security;
}

#elif NETCOREAPP2_1
#elif NETCOREAPP2_1 || NETCOREAPP3_0

private static PipeOptions CurrentUserOption = PipeOptions.CurrentUserOnly;

Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Shared/RuntimeHostInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ internal static bool IsDotNetHost(out string pathToDotNet)
internal static NamedPipeClientStream CreateNamedPipeClient(string serverName, string pipeName, PipeDirection direction, PipeOptions options) =>
new NamedPipeClientStream(serverName, pipeName, direction, options);

#elif NETCOREAPP2_1
#elif NETCOREAPP2_1 || NETCOREAPP3_0
internal static bool IsDesktopRuntime => false;

private static string DotNetHostPathEnvironmentName = "DOTNET_HOST_PATH";
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
using System.Threading;
using System.Threading.Tasks;

// The ShadowCopyAnalyzerAssemblyLoader derives from DesktopAnalyzerAssemblyLoader (NET472) OR CoreClrAnalyzerAssemblyLoader (NETCOREAPP2_1)
#if NET472 || NETCOREAPP2_1
// The ShadowCopyAnalyzerAssemblyLoader derives from DesktopAnalyzerAssemblyLoader (NET472) OR CoreClrAnalyzerAssemblyLoader (NETCOREAPP2_1 || NETCOREAPP3_0)
#if NET472 || NETCOREAPP2_1 || NETCOREAPP3_0

namespace Microsoft.CodeAnalysis
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
-->
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(FinalDefineConstants),NET472=-1</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp2.1'">$(FinalDefineConstants),NETCOREAPP2_1=-1</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp3.0'">$(FinalDefineConstants),NETCOREAPP3_0=-1</DefineConstants>

<!-- Disabling on assumption -->
<SkipTests Condition="'$(TestRuntime)' == 'Mono'">true</SkipTests>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ProjectReference Include="..\..\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" Condition="$(TargetFramework) == 'netcoreapp2.1'" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" Condition="$(TargetFramework) == 'netcoreapp2.1' Or $(TargetFramework) == 'netcoreapp3.0'" />
</ItemGroup>
<ItemGroup>
<Folder Include="My Project\" />
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/VisualBasic/vbc/vbc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Shared\RuntimeHostInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/Interactive/csi/csi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="csi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<None Include="csi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'">
<Link>csi.rsp</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="csi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<None Include="csi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'netcoreapp3.0'">
<Link>csi.rsp</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 2 additions & 2 deletions src/Interactive/vbi/vbi.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="vbi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<None Include="vbi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0'">
<Link>vbi.rsp</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="vbi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<None Include="vbi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1' And '$(TargetFramework)' != 'netcoreapp3.0'">
<Link>vbi.rsp</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>

<IsPackable>true</IsPackable>
<NuspecPackageId>Microsoft.NETCore.Compilers</NuspecPackageId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<Project>
<Target Name="InitializeCoreClrCompilerArtifacts">
<ItemGroup>
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\*.targets" />
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" />
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp3.0\publish\*.targets" />
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp3.0\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp3.0\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" />

<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\**\Microsoft.CodeAnalysis.resources.dll" />
Expand All @@ -16,23 +16,23 @@
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" />

<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.runtimeconfig.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp3.0\publish\csc.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp3.0\publish\csc.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp3.0\publish\csc.runtimeconfig.json" />

<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.runtimeconfig.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp3.0\publish\vbc.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp3.0\publish\vbc.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp3.0\publish\vbc.runtimeconfig.json" />

<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.runtimeconfig.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp3.0\publish\VBCSCompiler.dll" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp3.0\publish\VBCSCompiler.deps.json" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp3.0\publish\VBCSCompiler.runtimeconfig.json" />

<!-- References that are either not in the target framework or are a higher version -->
<!-- N.B.: The backslashes below cannot be replaced with forward slashes.
https://github.com/NuGet/Home/issues/3584 -->
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\System.*.dll"/>
<CoreClrCompilerBinRuntimesArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\runtimes\**" />
<CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp3.0\publish\System.*.dll"/>
<CoreClrCompilerBinRuntimesArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp3.0\publish\runtimes\**" />
</ItemGroup>
</Target>
</Project>
Loading