From 34338760ed6ae11ee7731bd745b6d0f5d15ad7ed Mon Sep 17 00:00:00 2001
From: danielmarbach <daniel.marbach@openplace.net>
Date: Wed, 18 Sep 2019 15:11:06 +0200
Subject: [PATCH 1/2] Remove net40

---
 .../PublicApiGenerator.csproj                 |  4 ++--
 .../Assembly_attributes.cs                    | 22 +------------------
 .../PublicApiGeneratorTests.csproj            |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/PublicApiGenerator/PublicApiGenerator.csproj b/src/PublicApiGenerator/PublicApiGenerator.csproj
index a4aaca4..d0a2b41 100644
--- a/src/PublicApiGenerator/PublicApiGenerator.csproj
+++ b/src/PublicApiGenerator/PublicApiGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>This library simply returns your public API as a string. You can use this in approval style tests or for documentation.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <SignAssembly>true</SignAssembly>
@@ -16,5 +16,5 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.CodeDom" Version="4.5.0" />
   </ItemGroup>
-  
+
 </Project>
\ No newline at end of file
diff --git a/src/PublicApiGeneratorTests/Assembly_attributes.cs b/src/PublicApiGeneratorTests/Assembly_attributes.cs
index f517157..120dda5 100644
--- a/src/PublicApiGeneratorTests/Assembly_attributes.cs
+++ b/src/PublicApiGeneratorTests/Assembly_attributes.cs
@@ -20,7 +20,6 @@ public class Assembly_attributes : ApiGeneratorTestsBase
         [Fact]
         public void Attributes()
         {
-#if NET452
             var api = @"[assembly: PublicApiGeneratorTests.Examples.AttributeWithMultiplePositionalParametersAttribute(42, ""Hello"")]
 [assembly: PublicApiGeneratorTests.Examples.AttributeWithNamedParameterAttribute(IntValue=42, StringValue=""Hello"")]
 [assembly: PublicApiGeneratorTests.Examples.AttributeWithPositionalParameters1Attribute(""Hello"")]
@@ -28,7 +27,7 @@ public void Attributes()
 [assembly: PublicApiGeneratorTests.Examples.SimpleAttribute()]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly: System.Runtime.InteropServices.GuidAttribute(""3B8D506A-5247-47FF-B053-D29A51A97C33"")]
-[assembly: System.Runtime.Versioning.TargetFrameworkAttribute("".NETFramework,Version=v4.5.2"", FrameworkDisplayName="".NET Framework 4.5.2"")]
+[assembly: System.Runtime.Versioning.TargetFrameworkAttribute("".NETCoreApp,Version=v2.2"", FrameworkDisplayName="""")]
 namespace PublicApiGeneratorTests.Examples
 {
     public class NotImportant
@@ -36,25 +35,6 @@ public class NotImportant
         public NotImportant() { }
     }
 }";
-#endif
-
-#if NETCOREAPP2_1
-            var api = @"[assembly: PublicApiGeneratorTests.Examples.AttributeWithMultiplePositionalParametersAttribute(42, ""Hello"")]
-[assembly: PublicApiGeneratorTests.Examples.AttributeWithNamedParameterAttribute(IntValue=42, StringValue=""Hello"")]
-[assembly: PublicApiGeneratorTests.Examples.AttributeWithPositionalParameters1Attribute(""Hello"")]
-[assembly: PublicApiGeneratorTests.Examples.AttributeWithPositionalParameters2Attribute(42)]
-[assembly: PublicApiGeneratorTests.Examples.SimpleAttribute()]
-[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
-[assembly: System.Runtime.InteropServices.GuidAttribute(""3B8D506A-5247-47FF-B053-D29A51A97C33"")]
-[assembly: System.Runtime.Versioning.TargetFrameworkAttribute("".NETCoreApp,Version=v2.1"", FrameworkDisplayName="""")]
-namespace PublicApiGeneratorTests.Examples
-{
-    public class NotImportant
-    {
-        public NotImportant() { }
-    }
-}";
-#endif
 
             AssertPublicApi<NotImportant>(api, true);
         }
diff --git a/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj b/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj
index 654360b..f42561c 100644
--- a/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj
+++ b/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <NoWarn>$(NoWarn);CS0067</NoWarn>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

From 1084da186a7762215f808a3b7f1747066bdfa253 Mon Sep 17 00:00:00 2001
From: danielmarbach <daniel.marbach@openplace.net>
Date: Thu, 19 Sep 2019 08:19:15 +0200
Subject: [PATCH 2/2] CodeDom

---
 src/PublicApiGenerator/PublicApiGenerator.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/PublicApiGenerator/PublicApiGenerator.csproj b/src/PublicApiGenerator/PublicApiGenerator.csproj
index d0a2b41..34454c1 100644
--- a/src/PublicApiGenerator/PublicApiGenerator.csproj
+++ b/src/PublicApiGenerator/PublicApiGenerator.csproj
@@ -11,9 +11,6 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="1.1.0" PrivateAssets="All" />
     <PackageReference Include="Mono.Cecil" Version="0.10.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.CodeDom" Version="4.5.0" />
   </ItemGroup>