Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Enable tests to compile with netstandard #15956

Merged
merged 7 commits into from Feb 8, 2017
Merged

Enable tests to compile with netstandard #15956

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e12208
Enable tests to compile with netstandard
tarekgh Feb 8, 2017
668d6fa
Fix System.Collections.Immutable
tarekgh Feb 8, 2017
3e98372
Merge branch 'master' of https://github.com/dotnet/corefx into NetFXT…
tarekgh Feb 8, 2017
21a2b80
update src configuration
tarekgh Feb 8, 2017
701815a
remove netstandard17 defines
tarekgh Feb 8, 2017
75c8d08
Split netcoreapp code to its own files
tarekgh Feb 8, 2017
c7908da
Remove 17 from the test class name
tarekgh Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tools-Override/ConstructSharedFx.targets
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
-->
<Target Name="ConstructTestingHost"
BeforeTargets="Build;BuildAllProjects"
Condition="!Exists('$(ConstructSharedFxSem)') OR '$(ReconstructSharedFx)' == 'true'" >
Condition="(!Exists('$(ConstructSharedFxSem)') OR '$(ReconstructSharedFx)' == 'true') And '$(TargetGroup)' != 'netfx'" >
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recently deleted this file so you can undo this change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am seeing the conflict :-)


<ItemGroup>
<!-- This will only copy over the related file -->
Expand Down
1 change: 1 addition & 0 deletions external/netfx/netfx.depproj
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
<RefPath Condition="'$(ForShims)' == 'true'">$(NetFxRefPath)</RefPath>
</BinplaceConfiguration>

<FileToExclude Include="System.EnterpriseServices" />
<FileToExclude Include="System.EnterpriseServices.Thunk" />
<FileToExclude Include="System.EnterpriseServices.Wrapper" />
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj
View file
Open in desktop
Expand Up @@ -12,8 +12,6 @@
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="RemoteExecutorConsoleApp.cs" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' or '$(TargetGroup)' == 'uap'">
<Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
<Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
Expand Down
2 changes: 2 additions & 0 deletions src/System.Collections.Immutable/tests/ImmutableListTest.cs
View file
Open in desktop
Expand Up @@ -780,6 +780,7 @@ public void DebuggerAttributesValid()
DebuggerAttributes.ValidateDebuggerDisplayReferences(rootNode);
}

#if netcoreapp
[Fact]
public void UsableWithCollectibleAssemblies()
{
Expand All @@ -798,6 +799,7 @@ public void UsableWithCollectibleAssemblies()

list.GetEnumerator(); // ensure this doesn't throw
}
#endif // netcoreapp

protected override IEnumerable<T> GetEnumerableOf<T>(params T[] contents)
{
Expand Down
3 changes: 1 addition & 2 deletions src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
View file
Open in desktop
Expand Up @@ -4,12 +4,11 @@
<PropertyGroup>
<ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
<NoWarn>0436</NoWarn>
<DefineConstants Condition="'$(TargetGroup)'=='netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="BadHasher.cs" />
<Compile Include="EverythingEqual.cs" />
Expand Down
12 changes: 7 additions & 5 deletions ...ystem.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
View file
Open in desktop
Expand Up @@ -11,6 +11,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp' And '$(TargetGroup)' != 'netstandard'">
<Compile Include="Drawing\ColorConverterTests.cs" />
<Compile Include="Drawing\PointConverterTests.cs" />
<Compile Include="Drawing\RectangleConverterTests.cs" />
<Compile Include="Drawing\SizeConverterTests.cs" />
<Compile Include="Drawing\SizeFConverterTests.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="ArrayConverterTests.cs" />
<Compile Include="AttributeCollectionTests.cs" />
Expand Down Expand Up @@ -60,11 +67,6 @@
<Compile Include="UriTypeConverterTests.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetGroup)' == 'netstandard'">
<Compile Include="Drawing\ColorConverterTests.cs" />
<Compile Include="Drawing\PointConverterTests.cs" />
<Compile Include="Drawing\RectangleConverterTests.cs" />
<Compile Include="Drawing\SizeConverterTests.cs" />
<Compile Include="Drawing\SizeFConverterTests.cs" />
<Compile Include="Drawing\StringTypeConverterTestBase.cs" />
<Compile Include="TimerTests.cs" />
<Compile Include="BindingListTests.cs" />
Expand Down
8 changes: 4 additions & 4 deletions src/System.Data.SqlClient/System.Data.SqlClient.sln
View file
Open in desktop
Expand Up @@ -70,10 +70,10 @@ Global
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
8 changes: 8 additions & 0 deletions src/System.Data.SqlClient/tests/ManualTests/Configurations.props
View file
Open in desktop
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
netcoreapp;
</BuildConfigurations>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
<PropertyGroup>
<ProjectGuid>{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition=" '$(TargetsWindows)' != 'true' ">
<DefineConstants>$(DefineConstants);MANAGED_SNI</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/System.Diagnostics.DiagnosticSource/ref/Configurations.props
View file
Open in desktop
Expand Up @@ -2,9 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
net45;
netstandard;
netstandard1.1;
</BuildConfigurations>
</PropertyGroup>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you figure out why the netstandard1.1 configuration was picked? I'm mainly interested because we might need to add it back at some point.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't look at this yet but I'll try later as I am curious too.

</Project>
6 changes: 1 addition & 5 deletions src/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
View file
Open in desktop
Expand Up @@ -5,17 +5,13 @@
<UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
<ProjectGuid>{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.Diagnostics.DiagnosticSource.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.1'">
<Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" />
<Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" />
<Reference Include="System.Runtime" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
Expand Down
1 change: 0 additions & 1 deletion src/System.Diagnostics.DiagnosticSource/src/Configurations.props
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
net45-Windows_NT;
netstandard1.1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are removing the netstandard1.1 ref you should probably do the same for the src.

netstandard1.3;
netstandard;
Expand Down
6 changes: 1 addition & 5 deletions src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
View file
Open in desktop
Expand Up @@ -17,8 +17,6 @@
<DefineConstants>;NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT</DefineConstants>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
Expand All @@ -27,8 +25,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System\Diagnostics\DiagnosticSource.cs" />
<Compile Include="System\Diagnostics\DiagnosticListener.cs" />
Expand All @@ -52,7 +48,7 @@
<Compile Include="System\Diagnostics\Activity.Id.Random.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetGroup)' != 'netstandard1.3' And '$(TargetGroup)' != 'netstandard1.1'">
<Compile Include="System\Diagnostics\Activity.Id.MachineName.cs" />
<Compile Include="System\Diagnostics\Activity.Id.MachineName.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Collections" />
Expand Down
1 change: 0 additions & 1 deletion src/System.Diagnostics.DiagnosticSource/tests/Configurations.props
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
net45-Windows_NT;
netstandard1.1;
netstandard1.3;
netstandard1.5;
Expand Down
2 changes: 0 additions & 2 deletions ...ystem.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
View file
Open in desktop
Expand Up @@ -4,8 +4,6 @@
<PropertyGroup>
<ProjectGuid>{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Debug|AnyCPU'" />
Expand Down
14 changes: 8 additions & 6 deletions src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
View file
Open in desktop
Expand Up @@ -13,12 +13,14 @@
<NoWarn>0649</NoWarn>
</PropertyGroup>
<!-- Help VS understand available configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Linux-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Linux-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-OSX-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-OSX-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Linux-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Linux-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="FxCopBaseline.cs" />
</ItemGroup>
Expand Down
12 changes: 7 additions & 5 deletions src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
View file
Open in desktop
Expand Up @@ -8,10 +8,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<!-- Help VS understand available configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System\IO\DriveInfo.cs" />
<Compile Include="System\IO\DriveNotFoundException.cs" />
Expand Down Expand Up @@ -108,4 +110,4 @@
<Reference Include="System.Threading.Tasks" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>
16 changes: 9 additions & 7 deletions src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
View file
Open in desktop
Expand Up @@ -6,12 +6,14 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<!-- Help VS understand available configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Linux-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Linux-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-OSX-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-OSX-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Linux-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Linux-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-OSX-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System\HResults.cs" />
<Compile Include="System\IO\ErrorEventArgs.cs" />
Expand Down Expand Up @@ -142,4 +144,4 @@
<Reference Include="System.Collections" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>
10 changes: 6 additions & 4 deletions src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
View file
Open in desktop
Expand Up @@ -31,6 +31,12 @@
<Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<Compile Include="File\AppendAsync.cs" />
<Compile Include="File\ReadWriteAllLinesAsync.cs" />
<Compile Include="File\ReadWriteAllBytesAsync.cs" />
<Compile Include="File\ReadWriteAllTextAsync.cs" />
</ItemGroup>
<ItemGroup>
<!-- Rewritten -->
<Compile Include="DirectoryInfo\GetSetAttributes.cs" />
Expand Down Expand Up @@ -82,16 +88,12 @@
<Compile Include="FileStream\ctor_str_fm_fa.cs" />
<Compile Include="FileStream\ctor_str_fm.cs" />
<Compile Include="File\Append.cs" />
<Compile Include="File\AppendAsync.cs" />
<Compile Include="File\Create.cs" />
<Compile Include="File\Delete.cs" />
<Compile Include="File\GetSetAttributes.cs" />
<Compile Include="File\Move.cs" />
<Compile Include="File\ReadWriteAllBytesAsync.cs" />
<Compile Include="File\ReadWriteAllLinesAsync.cs" />
<Compile Include="File\ReadWriteAllText.cs" />
<Compile Include="File\ReadWriteAllLines.cs" />
<Compile Include="File\ReadWriteAllTextAsync.cs" />
<Compile Include="PathFeatures.cs" />
<Compile Include="TestData.cs" />
<Compile Include="Tfm.cs" />
Expand Down
6 changes: 4 additions & 2 deletions src/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
View file
Open in desktop
Expand Up @@ -14,6 +14,10 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<Compile Include="System\IO\IsolatedStorage\IdentityTests.cs" />
<Compile Include="System\IO\IsolatedStorage\IsolatedStorageBaseClassTests.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)\System\IO\TempDirectory.cs">
<Link>Common\System\IO\TempDirectory.cs</Link>
Expand Down Expand Up @@ -46,8 +50,6 @@
<Compile Include="System\IO\IsolatedStorage\GetLastWriteTimeTests.cs" />
<Compile Include="System\IO\IsolatedStorage\HelperTests.cs" />
<Compile Include="System\IO\IsolatedStorage\GetStoreTests.cs" />
<Compile Include="System\IO\IsolatedStorage\IdentityTests.cs" />
<Compile Include="System\IO\IsolatedStorage\IsolatedStorageBaseClassTests.cs" />
<Compile Include="System\IO\IsolatedStorage\IsoStorageTest.cs" />
<Compile Include="System\IO\IsolatedStorage\MoveDirectoryTests.cs" />
<Compile Include="System\IO\IsolatedStorage\MoveFileTests.cs" />
Expand Down