Repository: reef
Updated Branches:
refs/heads/master 30abddb54 -> 7343e62c4
[REEF-2005] Update DotNet projects to target .net461
This updates all projects to target .net461, including the Bridge
project.
- Removes the conditional library references in the csproj files
for.net452 as this is no longer required.
- Additional updates were done to get the build and tests passing.
JIRA:
[REEF-2005](https://issues.apache.org/jira/browse/REEF-2005)
Pull Request:
This closes #1448
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/7343e62c
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/7343e62c
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/7343e62c
Branch: refs/heads/master
Commit: 7343e62c408dede8c46d2e72b4c58dda785e24b0
Parents: 30abddb
Author: Scott Inglis <[email protected]>
Authored: Fri Apr 20 13:02:39 2018 -0700
Committer: Markus Weimer <[email protected]>
Committed: Mon Apr 23 14:35:16 2018 -0700
----------------------------------------------------------------------
.../Org.Apache.REEF.Bridge.CLR.DotNet.csproj | 13 -----------
.../Org.Apache.REEF.Bridge.JAR.DotNet.csproj | 2 +-
.../Org.Apache.REEF.Bridge.DotNet.vcxproj | 13 ++++++++---
.../Org.Apache.REEF.Client.Tests.DotNet.csproj | 9 --------
.../Org.Apache.REEF.Client.DotNet.csproj | 23 ++++----------------
.../Org.Apache.REEF.Common.Tests.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.Common.DotNet.csproj | 7 ------
.../Org.Apache.REEF.Driver.DotNet.csproj | 6 -----
...rg.Apache.REEF.Evaluator.Tests.DotNet.csproj | 4 ----
.../Org.Apache.REEF.Evaluator.DotNet.csproj | 6 -----
...ache.REEF.Examples.AllHandlers.DotNet.csproj | 10 ---------
...he.REEF.Examples.DriverRestart.DotNet.csproj | 10 ---------
...Apache.REEF.Examples.HelloREEF.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.Examples.DotNet.csproj | 6 -----
.../Org.Apache.REEF.FatNuGet.DotNet.csproj | 12 ++++------
.../Org.Apache.REEF.IMRU.Examples.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.IMRU.Tests.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.IMRU.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.IO.TestClient.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.IO.Tests.DotNet.csproj | 13 -----------
.../TestAzureBlockBlobFileSystemE2E.cs | 4 +++-
.../Org.Apache.REEF.IO.DotNet.csproj | 13 -----------
...e.REEF.Network.Examples.Client.DotNet.csproj | 10 ---------
...g.Apache.REEF.Network.Examples.DotNet.csproj | 10 ---------
.../Org.Apache.REEF.Network.Tests.DotNet.csproj | 4 ----
.../Org.Apache.REEF.Network.DotNet.csproj | 7 ------
.../Org.Apache.REEF.Tang.Examples.DotNet.csproj | 5 -----
.../Org.Apache.REEF.Tang.Tests.DotNet.csproj | 5 -----
.../Org.Apache.REEF.Tang.DotNet.csproj | 7 ------
.../Org.Apache.REEF.Tests.DotNet.csproj | 6 -----
.../Org.Apache.REEF.Wake.DotNet.csproj | 6 -----
lang/cs/TestRunner.DotNet.proj | 2 +-
lang/cs/build.DotNetApp.props | 7 ++++--
lang/cs/build.DotNetLibrary.props | 16 +++++---------
lang/cs/build.DotNetTest.props | 10 ++++++++-
lang/cs/build.DotNetTest.targets | 2 +-
lang/cs/xunit.DotNet.props | 13 +----------
37 files changed, 45 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
index 7d149d9..8648713 100644
---
a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
@@ -35,19 +35,6 @@ under the License.
<PackageReference Include="Microsoft.Avro.Tools" Version="$(AvroVersion)"
/>
<PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Numerics" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
index 58ba70a..0c700bd 100644
---
a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
@@ -18,7 +18,7 @@ under the License.
<PropertyGroup>
<AssemblyName>Org.Apache.REEF.Bridge.JAR</AssemblyName>
<Description>Helper project that builds the Bridge JAR </Description>
- <TargetFramework>net452</TargetFramework>
+ <TargetFramework>net461</TargetFramework>
</PropertyGroup>
<Import Project="..\build.DotNet.props" />
<PropertyGroup>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
index 23dc0cb..49cff7d 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
+++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
@@ -23,6 +23,10 @@ under the License.
<Platform Condition="'$(Platform)' == ''">x64</Platform>
<SolutionDir Condition="'$(SolutionDir)' == ''">..</SolutionDir>
<ConfigurationType>Application</ConfigurationType>
+
+ <!-- Added for when the .net core build is enabled. This prevents
assemblies for the bridge
+ to be copied to the bin folder. -->
+
<ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
</PropertyGroup>
<Import Project="..\build.Common.DotNet.props" />
<ItemGroup Label="ProjectConfigurations">
@@ -37,7 +41,7 @@ under the License.
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6C7325D1-EBB6-4642-B34F-B66F46152230}</ProjectGuid>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>Org.Apache.REEF.Bridge</RootNamespace>
<WindowsTargetPlatformVersion Condition="'$(MSBuildAssemblyVersion)' >=
'15.0'">10.0.15063.0</WindowsTargetPlatformVersion>
@@ -108,7 +112,8 @@ under the License.
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\net452</AdditionalUsingDirectories>
+ <AdditionalUsingDirectories Condition="'$(EnableDotNetBuild)' ==
'False'">$(AdditionalUsingDirectories);$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\net461</AdditionalUsingDirectories>
+ <AdditionalUsingDirectories Condition="'$(EnableDotNetBuild)' ==
'True'">$(AdditionalUsingDirectories);$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0</AdditionalUsingDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -123,7 +128,9 @@ under the License.
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\net452</AdditionalUsingDirectories>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <AdditionalUsingDirectories Condition="'$(EnableDotNetBuild)' ==
'False'">$(AdditionalUsingDirectories);$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\net461</AdditionalUsingDirectories>
+ <AdditionalUsingDirectories Condition="'$(EnableDotNetBuild)' ==
'True'">$(AdditionalUsingDirectories);$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0</AdditionalUsingDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
index 182dbb0..7803aa3 100644
---
a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
@@ -26,17 +26,8 @@ under the License.
<ItemGroup>
<PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
- </ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="System.ServiceProcess.ServiceController"
Version="4.4.0" />
</ItemGroup>
- <!-- TODO: REEF-1888 Remove ItemGroup when removing net451 and net46 targets
-->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.ServiceProcess" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
index b568e1d..a7cc2e8 100644
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
@@ -37,31 +37,16 @@ under the License.
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core"
Version="$(TransientFaultHandlingVersion)" />
- </ItemGroup>
- <!-- TODO[JIRA REEF-1888] Remove the conditional, but keep the item group -->
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
- </ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Net.Http.WebRequest" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Runtime.Serialization" />
+ <PackageReference Include="System.Diagnostics.DiagnosticSource"
Version="4.3.0" />
</ItemGroup>
<!-- Project Reference conditionals allow for targeting specific projects
based upon the target framework. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<ProjectReference
Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj"
PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <ProjectReference
Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj"
PrivateAssets="All"/>
+ <ProjectReference
Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj"
PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
@@ -107,7 +92,7 @@ under the License.
var srcDir = @"lang\cs\Org.Apache.REEF.Client\Properties";
var binDir = @"lang\cs\bin\.netcore";
var resxInputPath = Path.Combine(ProjectFolder, srcDir,
"Resources.DotNet.xml");
- var resourceDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease,
"Org.Apache.REEF.Bridge.JAR", "net452");
+ var resourceDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease,
"Org.Apache.REEF.Bridge.JAR", "net461");
var clrDriverDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease,
"Org.Apache.REEF.Bridge");
var byteArrayType = ";System.Byte[], mscorlib, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089";
var jarRest = reefVersion + "-shaded.jar" + byteArrayType;
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
index b7cce9d..bd2b3f9 100644
---
a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="WindowsAzure.Storage"
Version="$(WindowsAzureStorageVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
index 1fd5366..8f13175 100644
--- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
@@ -30,13 +30,6 @@ under the License.
<PackageReference Include="System.Reactive.Core"
Version="$(SystemReactiveVersion)" />
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj
index 8be3f62..8c95b88 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj
@@ -27,12 +27,6 @@ under the License.
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj
index 07f6136..8462277 100644
---
a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj
@@ -23,10 +23,6 @@ under the License.
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj
index 7de529f..965ae8e 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj
@@ -26,12 +26,6 @@ under the License.
<ItemGroup>
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Configuration" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj
index 3f6c259..cfeab13 100644
---
a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Examples</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj
index c35c031..50cbc49 100644
---
a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Examples</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj
index 49628fe..47ee42c 100644
---
a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Examples</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj
index 8772120..94fd89a 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj
@@ -27,12 +27,6 @@ under the License.
<PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj
b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj
index dd72889..c0c4b2a 100644
--- a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj
@@ -28,16 +28,13 @@ under the License.
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetGramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
<!-- Project Reference conditionals allow for targeting specific projects
based upon the target framework. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
- <!-- Evaluator as a .netcoreapp can not be linked by a .netstandard
library, therefore this is only linked for net45 -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <!-- Evaluator as a .netcoreapp can not be linked by a .netstandard
library, therefore this is only linked for net461 -->
<ProjectReference
Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj"
PrivateAssets="All"/>
+ <!-- IMRU Examples as a .netcoreapp can not be linked by a .netstandard
library, therefore this is only linked for net461 -->
+ <ProjectReference
Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj"
PrivateAssets="All"/>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj"
PrivateAssets="All"/>
@@ -50,7 +47,6 @@ under the License.
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj"
PrivateAssets="All"/>
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
PrivateAssets="All"/>
<ProjectReference
Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj"
PrivateAssets="All"/>
- <ProjectReference
Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj"
PrivateAssets="All"/>
</ItemGroup>
<Import Project="..\build.DotNet.targets" />
<Target Name="CopyProjectReferencesToPackage"
DependsOnTargets="ResolveProjectReferences">
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj
index c615303..b99319f 100644
---
a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Examples IMRU</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj
index d8c435a..f464933 100644
---
a/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj
@@ -24,16 +24,6 @@ under the License.
<ItemGroup>
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj
index b002a72..5dfd5c2 100644
--- a/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF IMRU</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj
index e02e7ba..c6fee1b 100644
---
a/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF IO TestClient</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj
index bc5c3f9..15f0d18 100644
--- a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj
@@ -23,22 +23,9 @@ under the License.
<PackageReference Include="Microsoft.Azure.DataLake.Store"
Version="$(MicrosoftDataLakeStoreVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="WindowsAzure.Storage"
Version="$(WindowsAzureStorageVersion)" />
- </ItemGroup>
- <!-- TODO[JIRA REEF-1888] Remove the conditional, but keep the item group
-->
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs
b/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs
index 90a4746..4e47d6b 100644
--- a/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs
+++ b/lang/cs/Org.Apache.REEF.IO.Tests/TestAzureBlockBlobFileSystemE2E.cs
@@ -118,7 +118,9 @@ namespace Org.Apache.REEF.IO.Tests
}
blob = container.GetBlockBlobReference(HelloFile);
Assert.True(CheckBlobExists(blob));
- using (var reader = new StreamReader(blob.OpenRead()))
+ var readTask = blob.OpenReadAsync();
+ readTask.Wait();
+ using (var reader = new StreamReader(readTask.Result))
{
string streamText = reader.ReadToEnd();
Assert.Equal(Text, streamText);
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj
b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj
index d9f1801..3dc419e 100644
--- a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj
@@ -37,23 +37,10 @@ under the License.
<PackageReference Include="System.Spatial" Version="5.8.2" />
<PackageReference Include="WindowsAzure.Storage"
Version="$(WindowsAzureStorageVersion)" />
<PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
- </ItemGroup>
- <!-- TODO[JIRA REEF-1888] Remove the conditional, but keep the item group -->
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.IO.FileSystem.AccessControl"
Version="4.4.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj
index c8cffbe..0bbdb48 100644
---
a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Examples Network Client</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
index 9dffe68..cf65931 100644
---
a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
@@ -23,16 +23,6 @@ under the License.
<PackageTags>REEF Network services examples</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
index 5b286e9..3ee6b09 100644
---
a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
@@ -23,10 +23,6 @@ under the License.
<PackageReference Include="System.Reactive.Core"
Version="$(SystemReactiveVersion)" />
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
index 230cf8c..ff49cb8 100644
--- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
@@ -30,13 +30,6 @@ under the License.
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory"
Version="1.1.2" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
index 6160d31..c48bcfd 100644
---
a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
@@ -23,11 +23,6 @@ under the License.
<PackageTags> Apache REEF tang dependency injection examples</PackageTags>
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
index b3b5d68..60cd8dd 100644
---
a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
+++
b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
@@ -24,11 +24,6 @@ under the License.
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
<ItemGroup>
<None Include="simpleConstructorJavaProto.bin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
index 1d40e8e..7305a5d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
@@ -28,13 +28,6 @@ under the License.
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
</ItemGroup>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
index f03a11f..06b94f4 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
@@ -30,12 +30,6 @@ under the License.
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
<PackageReference Include="System.Spatial" Version="5.8.2" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
index 34ad138..777d41e 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
@@ -27,12 +27,6 @@ under the License.
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core"
Version="$(TransientFaultHandlingVersion)" />
<PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
</ItemGroup>
- <!-- TODO[JIRA REEF-1888] This item group will not be needed when only
.netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or
'$(TargetFramework)' == 'net46'">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj"
/>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/TestRunner.DotNet.proj
----------------------------------------------------------------------
diff --git a/lang/cs/TestRunner.DotNet.proj b/lang/cs/TestRunner.DotNet.proj
index c141813..5e853fe 100644
--- a/lang/cs/TestRunner.DotNet.proj
+++ b/lang/cs/TestRunner.DotNet.proj
@@ -27,7 +27,7 @@ under the License.
<Platform>x64</Platform>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == '' ">
- <TargetFramework>net452</TargetFramework>
+ <TargetFramework>net461</TargetFramework>
</PropertyGroup>
<Target Name="Test">
<MSBuild Projects="@(ProjectReferences)"
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/build.DotNetApp.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNetApp.props b/lang/cs/build.DotNetApp.props
index aa1a6fc..81ff791 100644
--- a/lang/cs/build.DotNetApp.props
+++ b/lang/cs/build.DotNetApp.props
@@ -27,10 +27,13 @@ under the License.
<!-- Settings for Windows platforms -->
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
- <TargetFrameworks>net452</TargetFrameworks>
+ <TargetFrameworks>net461</TargetFrameworks>
<!-- If EnableDotNetBuild is true, override the target frameworks to include
dot net core -->
- <TargetFrameworks Condition="'$(EnableDotNetBuild)' ==
'true'">net452;netcoreapp2.0</TargetFrameworks>
+ <TargetFrameworks Condition="'$(EnableDotNetBuild)' ==
'true'">netcoreapp2.0;net461</TargetFrameworks>
<OutputType>Exe</OutputType>
+
+ <!-- This is required to copy all referenced assemblies to the bin folder -->
+ <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<!-- REEF-1888: win7-x64 is needed for .net46 and .net451. Target a newer
version of windows once net46 and 451 are removed" -->
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/build.DotNetLibrary.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNetLibrary.props
b/lang/cs/build.DotNetLibrary.props
index 1bee8c7..16ad7a8 100644
--- a/lang/cs/build.DotNetLibrary.props
+++ b/lang/cs/build.DotNetLibrary.props
@@ -17,17 +17,13 @@ under the License.
-->
<Import Project="build.DotNet.props"/>
+<PropertyGroup>
+ <TargetFrameworks>net461</TargetFrameworks>
-<!-- Settings for Linux platform -->
-<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
-</PropertyGroup>
-
-<!-- Settings for Windows platform -->
-<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
- <TargetFrameworks>net452</TargetFrameworks>
<!-- If EnableDotNetBuild is true, override the target frameworks to include
dot net core -->
- <TargetFrameworks Condition="'$(EnableDotNetBuild)' ==
'true'">net452;netstandard2.0</TargetFrameworks>
-</PropertyGroup>
+ <TargetFrameworks Condition="'$(EnableDotNetBuild)' ==
'true'">netstandard2.0</TargetFrameworks>
+ <!-- If on Linux, override the target frameworks to netcoreapp2.0 -->
+ <TargetFrameworks Condition="'$(OS)' !=
'Windows_NT'">netcoreapp2.0</TargetFrameworks>
+</PropertyGroup>
</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/build.DotNetTest.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNetTest.props b/lang/cs/build.DotNetTest.props
index 467d73a..444ed1a 100644
--- a/lang/cs/build.DotNetTest.props
+++ b/lang/cs/build.DotNetTest.props
@@ -19,9 +19,17 @@ under the License.
<Import Project="build.DotNet.props"/>
<Import Project="xunit.DotNet.props"/>
<PropertyGroup>
- <TargetFrameworks>net452</TargetFrameworks>
+ <TargetFrameworks>net461</TargetFrameworks>
+
+ <!-- If EnableDotNetBuild is true, override the target frameworks to include
dot net core -->
+ <TargetFrameworks Condition="'$(EnableDotNetBuild)' ==
'true'">netcoreapp2.0;net461</TargetFrameworks>
+
+ <!-- If on Linux, override the target frameworks to netcoreapp2.0 -->
<TargetFrameworks Condition="'$(OS)' !=
'Windows_NT'">netcoreapp2.0</TargetFrameworks>
+ <!-- This is required to copy all referenced assemblies to the bin folder -->
+ <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+
<!-- Set this attribute to prevent test projects from being packaged -->
<IsTestProject>true</IsTestProject>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/build.DotNetTest.targets
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNetTest.targets b/lang/cs/build.DotNetTest.targets
index 3787bbc..4be3d8c 100644
--- a/lang/cs/build.DotNetTest.targets
+++ b/lang/cs/build.DotNetTest.targets
@@ -18,7 +18,7 @@ under the License.
<Import Project="build.DotNet.targets"/>
<Target Name="Test">
- <Exec
Command="$(PackagesDir)\xunit.runner.console\2.1.0\tools\xunit.console.exe
$(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html
$(OutputPath)\xunit_report.html"
+ <Exec
Command="$(PackagesDir)\xunit.runner.console\2.2.0\tools\xunit.console.exe
$(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html
$(OutputPath)\xunit_report.html"
IgnoreStandardErrorWarningFormat="true"/>
</Target>
http://git-wip-us.apache.org/repos/asf/reef/blob/7343e62c/lang/cs/xunit.DotNet.props
----------------------------------------------------------------------
diff --git a/lang/cs/xunit.DotNet.props b/lang/cs/xunit.DotNet.props
index 2fb4fab..8bb0a93 100644
--- a/lang/cs/xunit.DotNet.props
+++ b/lang/cs/xunit.DotNet.props
@@ -15,22 +15,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
- <PropertyGroup>
- <!-- Required check for .net451 test projects to work appropriately -->
- <DebugType Condition="'$(TargetFramework)' != '' AND
!$(TargetFramework.StartsWith('netcoreapp'))">Full</DebugType>
- </PropertyGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0' Or
'$(TargetFramework)' == 'net46'">
+ <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0"
NoWarn="NU1701"/>
<PackageReference Include="xunit" Version="2.2.0" NoWarn="NU1701"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0"
NoWarn="NU1701"/>
<PackageReference Include="xunit.runner.console" Version="2.2.0"
NoWarn="NU1701"/>
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0"
NoWarn="NU1701"/>
- <PackageReference Include="xunit" Version="2.1.0" NoWarn="NU1701"/>
- <PackageReference Include="xunit.runner.visualstudio" Version="2.1.0"
NoWarn="NU1701"/>
- <PackageReference Include="xunit.runner.console" Version="2.1.0"
NoWarn="NU1701"/>
- </ItemGroup>
</Project>
