Change library projects to target .Net Standard and their tests to Core

Had to resolve some minor incompatibilities. E.g. MoreLinq extension methods that are also part of System.Linq in .Net Standard 2.0
PoESkillTree · Jun 21, 2019 · c944929 · c944929
1 parent c9c0174
commit c944929
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 92 deletions.
diff --git a/PoESkillTree.Computation.Builders.Tests/PoESkillTree.Computation.Builders.Tests.csproj b/PoESkillTree.Computation.Builders.Tests/PoESkillTree.Computation.Builders.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PoESkillTree.Computation.Builders</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Builders.Tests</AssemblyTitle>
     <Product>PoESkillTree.Computation.Builders.Tests</Product>
@@ -11,7 +11,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -33,10 +33,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Builders\PoESkillTree.Computation.Builders.csproj" />

diff --git a/PoESkillTree.Computation.Builders/Behaviors/ConversionTargeUncappedSubtotalValue.cs b/PoESkillTree.Computation.Builders/Behaviors/ConversionTargeUncappedSubtotalValue.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using MoreLinq;
 using PoESkillTree.Computation.Common;
 
 namespace PoESkillTree.Computation.Builders.Behaviors

diff --git a/PoESkillTree.Computation.Builders/PoESkillTree.Computation.Builders.csproj b/PoESkillTree.Computation.Builders/PoESkillTree.Computation.Builders.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Builders</AssemblyTitle>
     <Product>PoESkillTree.Computation.Builders</Product>
     <Copyright>Copyright ©  2018</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -19,9 +18,6 @@
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Common\PoESkillTree.Computation.Common.csproj" />

diff --git a/PoESkillTree.Computation.Common.Tests/PoESkillTree.Computation.Common.Tests.csproj b/PoESkillTree.Computation.Common.Tests/PoESkillTree.Computation.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PoESkillTree.Computation.Common</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Common.Tests</AssemblyTitle>
     <Product>PoESkillTree.Computation.Common.Tests</Product>
@@ -11,7 +11,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -32,9 +32,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.GameModel\PoESkillTree.GameModel.csproj" />
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />

diff --git a/PoESkillTree.Computation.Common/PoESkillTree.Computation.Common.csproj b/PoESkillTree.Computation.Common/PoESkillTree.Computation.Common.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Common</AssemblyTitle>
     <Product>PoESkillTree.Computation.Common</Product>
     <Copyright>Copyright ©  2018</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -20,9 +19,6 @@
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.GameModel\PoESkillTree.GameModel.csproj" />

diff --git a/PoESkillTree.Computation.Console/PoESkillTree.Computation.Console.csproj b/PoESkillTree.Computation.Console/PoESkillTree.Computation.Console.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Console</AssemblyTitle>
     <Product>PoESkillTree.Computation.Console</Product>
     <Copyright>Copyright ©  2017</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -24,9 +23,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Builders\PoESkillTree.Computation.Builders.csproj" />

diff --git a/PoESkillTree.Computation.Core.Tests/PoESkillTree.Computation.Core.Tests.csproj b/PoESkillTree.Computation.Core.Tests/PoESkillTree.Computation.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PoESkillTree.Computation.Core</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Core.Tests</AssemblyTitle>
     <Product>PoESkillTree.Computation.Core.Tests</Product>
@@ -11,7 +11,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -32,9 +32,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.GameModel\PoESkillTree.GameModel.csproj" />
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />

diff --git a/PoESkillTree.Computation.Core/Nodes/MultiPathFormAggregatingValue.cs b/PoESkillTree.Computation.Core/Nodes/MultiPathFormAggregatingValue.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using MoreLinq;
 using PoESkillTree.Computation.Common;
 
 namespace PoESkillTree.Computation.Core.Nodes

diff --git a/PoESkillTree.Computation.Core/PoESkillTree.Computation.Core.csproj b/PoESkillTree.Computation.Core/PoESkillTree.Computation.Core.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Core</AssemblyTitle>
     <Product>PoESkillTree.Computation.Core</Product>
     <Copyright>Copyright ©  2017</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -21,9 +20,6 @@
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Common\PoESkillTree.Computation.Common.csproj" />

diff --git a/PoESkillTree.Computation.Data.Tests/PoESkillTree.Computation.Data.Tests.csproj b/PoESkillTree.Computation.Data.Tests/PoESkillTree.Computation.Data.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PoESkillTree.Computation.Data</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Data.Tests</AssemblyTitle>
     <Product>PoESkillTree.Computation.Data.Tests</Product>
@@ -11,7 +11,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -32,9 +32,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Common\PoESkillTree.Computation.Common.csproj" />

diff --git a/PoESkillTree.Computation.Data/PoESkillTree.Computation.Data.csproj b/PoESkillTree.Computation.Data/PoESkillTree.Computation.Data.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Data</AssemblyTitle>
     <Product>PoESkillTree.Computation.Data</Product>
     <Copyright>Copyright ©  2017</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -20,9 +19,6 @@
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Common\PoESkillTree.Computation.Common.csproj" />

diff --git a/PoESkillTree.Computation.IntegrationTests/ParsingTestUtils.cs b/PoESkillTree.Computation.IntegrationTests/ParsingTestUtils.cs
@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MoreLinq;
+using System.Reflection;
 using NUnit.Framework;
 using PoESkillTree.Computation.Common;
 using PoESkillTree.Computation.Parsing;
 using PoESkillTree.GameModel;
 using PoESkillTree.GameModel.StatTranslation;
+using static MoreLinq.Extensions.EquiZipExtension;
 
 namespace PoESkillTree.Computation.IntegrationTests
 {
@@ -81,7 +82,7 @@ public static IEnumerable<string> ReadNotParseableStatLines()
             => ReadDataLines("NotParseableStatLines").Concat(ReadDataLines("NotYetParseableStatLines"));
 
         public static IEnumerable<string> ReadDataLines(string fileName)
-            => File.ReadAllLines(TestContext.CurrentContext.TestDirectory + $"/Data/{fileName}.txt")
+            => File.ReadAllLines(AppContext.BaseDirectory + $"/Data/{fileName}.txt")
                 .Where(s => !s.StartsWith("//", StringComparison.Ordinal))
                 .Distinct();
 

diff --git a/PoESkillTree.Computation.IntegrationTests/PoESkillTree.Computation.IntegrationTests.csproj b/PoESkillTree.Computation.IntegrationTests/PoESkillTree.Computation.IntegrationTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.IntegrationTests</AssemblyTitle>
     <Product>PoESkillTree.Computation.IntegrationTests</Product>
@@ -10,7 +10,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -33,9 +33,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>

diff --git a/PoESkillTree.Computation.Parsing.Tests/PoESkillTree.Computation.Parsing.Tests.csproj b/PoESkillTree.Computation.Parsing.Tests/PoESkillTree.Computation.Parsing.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PoESkillTree.Computation.Parsing</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Parsing.Tests</AssemblyTitle>
     <Product>PoESkillTree.Computation.Parsing.Tests</Product>
@@ -11,7 +11,7 @@
     <NUnit3 Assemblies="$(OutputPath)/$(TargetFileName)" ToolPath="..\packages\NUnit.ConsoleRunner.3.7.0\tools\" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -33,9 +33,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Computation.Builders\PoESkillTree.Computation.Builders.csproj" />
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />

diff --git a/PoESkillTree.Computation.Parsing.Tests/SkillParsers/SkillsParserTest.cs b/PoESkillTree.Computation.Parsing.Tests/SkillParsers/SkillsParserTest.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Moq;
-using MoreLinq;
 using NUnit.Framework;
 using PoESkillTree.Computation.Builders.Stats;
 using PoESkillTree.Computation.Common;

diff --git a/PoESkillTree.Computation.Parsing/CoreParser.cs b/PoESkillTree.Computation.Parsing/CoreParser.cs
@@ -30,7 +30,7 @@ namespace PoESkillTree.Computation.Parsing
     public class CoreParser<TStep> : ICoreParser
     {
         private static readonly ILog Log =
-            LogManager.GetLogger($"{typeof(CoreParser<>).FullName}<{typeof(TStep).Name}>");
+            LogManager.GetLogger(typeof(CoreParser<>).Assembly, $"{typeof(CoreParser<>).FullName}<{typeof(TStep).Name}>");
 
         private delegate StringParseResult<IReadOnlyList<Modifier>> Parser(CoreParserParameter parameter);
 

diff --git a/PoESkillTree.Computation.Parsing/Parser.cs b/PoESkillTree.Computation.Parsing/Parser.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MoreLinq;
 using PoESkillTree.Computation.Common;
 using PoESkillTree.Computation.Common.Builders;
 using PoESkillTree.Computation.Common.Data;

diff --git a/PoESkillTree.Computation.Parsing/PoESkillTree.Computation.Parsing.csproj b/PoESkillTree.Computation.Parsing/PoESkillTree.Computation.Parsing.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyTitle>PoESkillTree.Computation.Parsing</AssemblyTitle>
     <Product>PoESkillTree.Computation.Parsing</Product>
     <Copyright>Copyright ©  2017</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />
   </ItemGroup>
@@ -21,9 +20,6 @@
     <PackageReference Include="morelinq" Version="3.1.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PoESkillTree.Utils\PoESkillTree.Utils.csproj" />
     <ProjectReference Include="..\PoESkillTree.Computation.Common\PoESkillTree.Computation.Common.csproj" />