Skip to content

Commit c7e7c86

Browse files
SteveWilkesSteveWilkes
committed
Fixing .NET Standard Get open generic parameters / Adding package icon / Updating test projects to .NET Core format
1 parent 7c56129 commit c7e7c86

File tree

53 files changed

+1524
-2630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1524
-2630
lines changed

‎CommonAssemblyInfo.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎common.props‎ renamed to ‎Directory.Build.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<Project>
1+
<Project>
22

33
<PropertyGroup>
44
<Company>AgileObjects Ltd</Company>
5-
<Copyright>Copyright © AgileObjects Ltd 2018</Copyright>
5+
<Product>AgileObjects.NetStandardPolyfills</Product>
66
<Authors>Steve Wilkes</Authors>
7+
<Copyright>Copyright © AgileObjects Ltd 2020</Copyright>
8+
<NeutralResourcesLanguage>en</NeutralResourcesLanguage>
79
<AssemblyOriginatorKeyFile>..\NetStandardPolyfills.snk</AssemblyOriginatorKeyFile>
810
<SignAssembly>true</SignAssembly>
911
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1012
<RepositoryType>git</RepositoryType>
1113
<RepositoryUrl>https://github.com/AgileObjects/NetStandardPolyfills</RepositoryUrl>
12-
<Summary>Type and Reflection polyfill extension methods for .NET Standard 1.0+ and .NET 3.5+</Summary>
13-
<Description>Type and Reflection polyfill extension methods for .NET Standard 1.0+ and .NET 3.5+</Description>
14-
<Version>1.4.0</Version>
15-
<VersionPrefix>1.4.0</VersionPrefix>
16-
<AssemblyVersion>1.4.0.0</AssemblyVersion>
17-
<FileVersion>1.4.0.0</FileVersion>
14+
<Version>1.4.1</Version>
15+
<VersionPrefix>1.4.1</VersionPrefix>
16+
<AssemblyVersion>1.4.1.0</AssemblyVersion>
17+
<FileVersion>1.4.1.0</FileVersion>
1818
</PropertyGroup>
1919

2020
</Project>

‎NetStandardPolyfills.UnitTests.Net35/NetStandardPolyfills.UnitTests.Net35.csproj‎

Lines changed: 37 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,50 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{378EE300-C36E-4C4C-8D15-04041CD07451}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>AgileObjects.NetStandardPolyfills.UnitTests.Net35</RootNamespace>
11-
<AssemblyName>AgileObjects.NetStandardPolyfills.UnitTests.Net35</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
4+
<TargetFramework>net35</TargetFramework>
5+
<LangVersion>8.0</LangVersion>
6+
<RootNamespace>AgileObjects.NetStandardPolyfills.UnitTests</RootNamespace>
7+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8+
<WarningsAsErrors></WarningsAsErrors>
9+
<NoWarn>0649;1701;1702</NoWarn>
1710
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
11+
<IsPackable>false</IsPackable>
2312
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
13+
14+
<PropertyGroup>
15+
<FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
3116
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
34-
<HintPath>..\packages\NUnit.3.6.1\lib\net35\nunit.framework.dll</HintPath>
35-
</Reference>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Xml" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="..\CommonAssemblyInfo.cs">
45-
<Link>Properties\CommonAssemblyInfo.cs</Link>
46-
</Compile>
47-
</ItemGroup>
17+
18+
<PropertyGroup>
19+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_DBNULL</DefineConstants>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
23+
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
27+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
28+
</PropertyGroup>
29+
4830
<ItemGroup>
4931
<Compile Include="..\NetStandardPolyfills.UnitTests.Net40\**\*.cs" Exclude="..\NetStandardPolyfills.UnitTests.Net40\obj\**\*.cs;">
5032
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
5133
</Compile>
5234
</ItemGroup>
35+
5336
<ItemGroup>
54-
<ProjectReference Include="..\NetStandardPolyfills.UnitTests\NetStandardPolyfills.UnitTests.csproj">
55-
<Project>{e55fc755-fa63-46e8-8c0b-573e312ecdff}</Project>
56-
<Name>NetStandardPolyfills.UnitTests</Name>
57-
</ProjectReference>
37+
<Reference Include="System" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
39+
<PackageReference Include="NUnit" Version="3.12.0" />
40+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
41+
<PrivateAssets>all</PrivateAssets>
42+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43+
</PackageReference>
5844
</ItemGroup>
45+
5946
<ItemGroup>
60-
<None Include="packages.config" />
47+
<ProjectReference Include="..\NetStandardPolyfills\NetStandardPolyfills.csproj" />
6148
</ItemGroup>
62-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63-
</Project>
49+
50+
</Project>

‎NetStandardPolyfills.UnitTests.Net35/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎NetStandardPolyfills.UnitTests.Net40/NetStandardPolyfills.UnitTests.Net40.csproj‎

Lines changed: 30 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{5BD3F71B-B71F-4152-A97B-ECBBC209A7F5}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>AgileObjects.NetStandardPolyfills.UnitTests.Net40</RootNamespace>
11-
<AssemblyName>AgileObjects.NetStandardPolyfills.UnitTests.Net40</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
4+
<TargetFramework>net461</TargetFramework>
5+
<LangVersion>8.0</LangVersion>
6+
<RootNamespace>AgileObjects.NetStandardPolyfills.UnitTests</RootNamespace>
7+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8+
<WarningsAsErrors></WarningsAsErrors>
9+
<NoWarn>0649;1701;1702</NoWarn>
1710
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
11+
<IsPackable>false</IsPackable>
2312
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
13+
14+
<PropertyGroup>
15+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_DBNULL</DefineConstants>
3116
</PropertyGroup>
17+
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
19+
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
23+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
24+
</PropertyGroup>
25+
3226
<ItemGroup>
33-
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
34-
<HintPath>..\packages\NUnit.3.9.0\lib\net40\nunit.framework.dll</HintPath>
35-
</Reference>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Xml" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="..\CommonAssemblyInfo.cs">
46-
<Link>Properties\CommonAssemblyInfo.cs</Link>
47-
</Compile>
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="WhenCheckingAssemblyData.cs" />
50-
<Compile Include="WhenCheckingTypeData.cs" />
51-
<Compile Include="WhenRetrievingTypeCodes.cs" />
52-
<Compile Include="WhenRetrievingTypeConstructors.cs" />
53-
<Compile Include="WhenRetrievingTypeFields.cs" />
54-
<Compile Include="WhenRetrievingTypeMembers.cs" />
55-
<Compile Include="WhenRetrievingTypeMethods.cs" />
56-
<Compile Include="WhenRetrievingTypeOperators.cs" />
57-
<Compile Include="WhenRetrievingTypeProperties.cs" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<ProjectReference Include="..\NetStandardPolyfills.UnitTests\NetStandardPolyfills.UnitTests.csproj">
61-
<Project>{e55fc755-fa63-46e8-8c0b-573e312ecdff}</Project>
62-
<Name>NetStandardPolyfills.UnitTests</Name>
63-
</ProjectReference>
27+
<PackageReference Include="NUnit" Version="3.12.0" />
28+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31+
</PackageReference>
6432
</ItemGroup>
33+
6534
<ItemGroup>
66-
<None Include="packages.config" />
35+
<ProjectReference Include="..\NetStandardPolyfills\NetStandardPolyfills.csproj" />
6736
</ItemGroup>
68-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
69-
</Project>
37+
38+
</Project>

‎NetStandardPolyfills.UnitTests.Net40/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎NetStandardPolyfills.UnitTests/Should.cs‎ renamed to ‎NetStandardPolyfills.UnitTests.Net40/Should.cs‎

File renamed without changes.

‎NetStandardPolyfills.UnitTests/TestExtensions.cs‎ renamed to ‎NetStandardPolyfills.UnitTests.Net40/ShouldExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Linq;
66

7-
internal static class TestExtensions
7+
internal static class ShouldExtensions
88
{
99
public static void ShouldBeTrue(this bool boolValue)
1010
{

‎NetStandardPolyfills.UnitTests/TestClasses/ConstructorTestsHelper.cs‎ renamed to ‎NetStandardPolyfills.UnitTests.Net40/TestClasses/ConstructorTestsHelper.cs‎

File renamed without changes.

‎NetStandardPolyfills.UnitTests/TestClasses/MethodTestsHelper.cs‎ renamed to ‎NetStandardPolyfills.UnitTests.Net40/TestClasses/MethodTestsHelper.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)