Post merge fix

akkadotnet · May 12, 2022 · 5a06c13 · 5a06c13
1 parent d1bdc00
commit 5a06c13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 42 deletions.
diff --git a/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj b/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj
@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\..\common.props"/>
 
-  <PropertyGroup>
-    <AssemblyTitle>Akka.TestKit.Xunit2</AssemblyTitle>
-    <Description>TestKit for writing tests for Akka.NET using xUnit.</Description>
-    <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
-    <PackageTags>$(AkkaPackageTags);testkit;xunit</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
     <PropertyGroup>
         <AssemblyTitle>Akka.TestKit.Xunit2</AssemblyTitle>
         <Description>TestKit for writing tests for Akka.NET using xUnit.</Description>

diff --git a/src/core/Akka.FSharp/Akka.FSharp.fsproj b/src/core/Akka.FSharp/Akka.FSharp.fsproj
@@ -1,15 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\common.props"/>
 
-  <PropertyGroup>
-    <AssemblyTitle>Akka.FSharp</AssemblyTitle>
-    <Description>F# API support for Akka.NET</Description>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
-    <PackageTags>$(AkkaPackageTags);F#;fsharp</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-    <NoWarn></NoWarn>    
-  </PropertyGroup>
     <PropertyGroup>
         <AssemblyTitle>Akka.FSharp</AssemblyTitle>
         <Description>F# API support for Akka.NET</Description>

diff --git a/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj b/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj
@@ -1,14 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\common.props"/>
 
-  <PropertyGroup>
-    <AssemblyTitle>Akka.Persistence.FSharp</AssemblyTitle>
-    <Description>F# API for persistence actors in Akka.NET</Description>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
-    <PackageTags>akka;actors;actor model;Akka;concurrency;F#;Fsharp;persistence;eventsource</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
     <PropertyGroup>
         <AssemblyTitle>Akka.Persistence.FSharp</AssemblyTitle>
         <Description>F# API for persistence actors in Akka.NET</Description>

diff --git a/src/core/Akka.TestKit/Akka.TestKit.csproj b/src/core/Akka.TestKit/Akka.TestKit.csproj
@@ -1,14 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\common.props"/>
 
-  <PropertyGroup>
-    <AssemblyTitle>Akka.TestKit</AssemblyTitle>
-    <Description>You need a Akka.TestKit.* package! Add the one appropriate for the test framework you use instead. For example: Akka.TestKit.Xunit or Akka.TestKit.VsTest. This package only contains base functionality for writing tests for the Akka.NET framework.</Description>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
-    <PackageTags>$(AkkaPackageTags)</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-      <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
     <PropertyGroup>
         <AssemblyTitle>Akka.TestKit</AssemblyTitle>
         <Description>You need a Akka.TestKit.* package! Add the one appropriate for the test framework you use instead. For example: Akka.TestKit.Xunit or Akka.TestKit.VsTest. This package only contains base functionality for writing tests for the Akka.NET framework.</Description>
@@ -34,17 +26,14 @@
         </Compile>
     </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-    <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
-    <PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+        <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
+        <PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2" />
+        <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+        <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    </ItemGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-  </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
     </PropertyGroup>