Skip to content

Commit f9bce68

Browse files
rojiroji
committed
Depend on .NET Framework targeting pack nugets
Depend on .NET Framework reference assemblies via the new nuget packages. This allows us to build .NET Framework on systems where .NET Framework isn't installed (e.g. Linux).
1 parent 2e432c1 commit f9bce68

9 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,11 @@
2626
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Npgsql.snk</AssemblyOriginatorKeyFile>
2727
<SignAssembly>true</SignAssembly>
2828
</PropertyGroup>
29+
30+
<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
31+
(e.g. Linux). Gets ignored on non-framework TFMs. -->
32+
<ItemGroup>
33+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
34+
</ItemGroup>
35+
2936
</Project>

‎src/Npgsql.GeoJSON/Npgsql.GeoJSON.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres postgis geojson spatial ado ado.net database sql</PackageTags>
66
<VersionPrefix>1.0.0</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
98
<SignAssembly>false</SignAssembly>
109
</PropertyGroup>
1110
<ItemGroup>

‎src/Npgsql.Json.NET/Npgsql.Json.NET.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<Description>Json.NET plugin for Npgsql, allowing transparent serialization/deserialization of JSON objects directly to and from the database.</Description>
55
<PackageTags>npgsql postgresql json postgres ado ado.net database sql</PackageTags>
66
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
7-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
87
<VersionPrefix>1.0.0</VersionPrefix>
98
</PropertyGroup>
109
<ItemGroup>

‎src/Npgsql.LegacyPostgis/Npgsql.LegacyPostgis.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres postgis spatial geometry geography ado ado.net database sql</PackageTags>
66
<VersionPrefix>1.0.0</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
98
</PropertyGroup>
109
<ItemGroup>
1110
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />

‎src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres postgis nts ado ado.net database sql</PackageTags>
66
<VersionPrefix>1.0.2</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
98
<NoWarn>NU5104</NoWarn>
109
</PropertyGroup>
1110
<ItemGroup>

‎src/Npgsql.NodaTime/Npgsql.NodaTime.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres nodatime date time ado ado.net database sql</PackageTags>
66
<VersionPrefix>4.1.0</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
98
</PropertyGroup>
109
<ItemGroup>
1110
<PackageReference Include="NodaTime" Version="2.4.4" />

‎src/Npgsql.RawPostgis/Npgsql.RawPostgis.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres postgis spatial geometry geography ado ado.net database sql</PackageTags>
66
<VersionPrefix>1.0.0</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0</TargetFrameworks>
98
</PropertyGroup>
109
<ItemGroup>
1110
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />

‎src/Npgsql/Npgsql.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PackageTags>npgsql postgresql postgres ado ado.net database sql</PackageTags>
66
<VersionPrefix>4.1.0</VersionPrefix>
77
<TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netstandard2.0;netstandard2.1</TargetFrameworks>
98
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
109
</PropertyGroup>
1110
<ItemGroup>

‎test/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
<!-- Build configuration -->
55
<PropertyGroup>
66
<TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
7-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' OR '$(CoreOnly)' == 'True'">netcoreapp3.0</TargetFrameworks>
87
</PropertyGroup>
98
</Project>

0 commit comments

Comments
 (0)