Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove net40 #89

Merged
merged 2 commits into from Sep 19, 2019
Merged

Remove net40 #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3433876
Remove net40
danielmarbach Sep 18, 2019
1084da1
CodeDom
danielmarbach Sep 19, 2019
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
4 changes: 2 additions & 2 deletions src/PublicApiGenerator/PublicApiGenerator.csproj
View file
Open in desktop
@@ -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>
Expand All @@ -16,5 +16,5 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
danielmarbach marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="System.CodeDom" Version="4.5.0" />
</ItemGroup>

</Project>
22 changes: 1 addition & 21 deletions src/PublicApiGeneratorTests/Assembly_attributes.cs
View file
Open in desktop
Expand Up @@ -20,41 +20,21 @@ 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"")]
[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("".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
{
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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj
View file
Open in desktop
@@ -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>
Expand Down