Skip to content

Commit eededeb

Browse files
xperiandrixperiandri
committed
Extracted the target frameworks into a single file
1 parent 6e6aceb commit eededeb

9 files changed

Lines changed: 51 additions & 76 deletions

File tree

‎.github/workflows/publish_ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
- name: Set Build Version
1818
run: |
1919
$File = (
20-
Select-Xml -XPath "/Project/PropertyGroup[@Label='NuGet']/Version" -Path "Directory.Build.targets"
20+
Select-Xml -XPath "/Project/PropertyGroup[@Label='NuGet']/Version" -Path "Directory.Build.props"
2121
)[0].Node
2222
$version = "$($File.InnerText)-ci-$Env:GITHUB_RUN_ID"
2323
$File.InnerText = $version
24-
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.targets))
24+
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.props))
2525
echo "VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
2626
shell: pwsh
2727

‎.github/workflows/publish_release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
run: |
2121
$version = "$env:GITHUB_REF_NAME"
2222
$File = (
23-
Select-Xml -XPath "/Project/PropertyGroup[@Label='NuGet']/Version" -Path "Directory.Build.targets"
23+
Select-Xml -XPath "/Project/PropertyGroup[@Label='NuGet']/Version" -Path "Directory.Build.props"
2424
)[0].Node
2525
$File.InnerText = $version
26-
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.targets))
26+
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.props))
2727
echo "VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
2828
shell: pwsh
2929

‎Directory.Build.props‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<PackageTargetFrameworks>net6.0;net7.0</PackageTargetFrameworks>
5+
<LangVersion>7.0</LangVersion>
6+
<FSharpCoreVersion>7.0.*</FSharpCoreVersion>
7+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
8+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
9+
<NoWarn>$(NoWarn);NU1504;NU1701</NoWarn>
10+
<TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
11+
</PropertyGroup>
12+
13+
<PropertyGroup Label="NuGet">
14+
<Authors>John Bazinga, Andrii Chebukin, Jurii Chebukin, Ismael Carlos Velten, njlr, Garrett Birkel</Authors>
15+
<Product>FSharp.Data.GraphQL</Product>
16+
<Summary>F# implementation of Facebook GraphQL query language</Summary>
17+
18+
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot>
19+
<RepositoryUrl>https://github.com/fsprojects/FSharp.Data.GraphQL</RepositoryUrl>
20+
<RepositoryType>git</RepositoryType>
21+
<Version>2.0.0</Version>
22+
<PackageTags>FSharp GraphQL Relay React Middleware</PackageTags>
23+
<PackageReadmeFile>README.md</PackageReadmeFile>
24+
<PackageIcon>icon.png</PackageIcon>
25+
<!--<PackageIconUrl>https://www.newtonsoft.com/content/images/nugeticon.png</PackageIconUrl>-->
26+
<PackageProjectUrl>https://fsprojects.github.io/FSharp.Data.GraphQL</PackageProjectUrl>
27+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
28+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
<IncludeSymbols>true</IncludeSymbols>
31+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33+
34+
<MinVerTagPrefix>v</MinVerTagPrefix>
35+
</PropertyGroup>
36+
37+
<ItemGroup>
38+
<None Include="$(RepoRoot)\icon.png" Pack="true" PackagePath="\" />
39+
<None Include="$(RepoRoot)\README.md" Pack="true" PackagePath="\" />
40+
</ItemGroup>
41+
42+
</Project>

‎Directory.Build.targets‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,3 @@
11
<Project>
22
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
3-
4-
<PropertyGroup>
5-
<LangVersion>7.0</LangVersion>
6-
<FSharpCoreVersion>7.0.*</FSharpCoreVersion>
7-
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
8-
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
9-
<NoWarn>$(NoWarn);NU1504;NU1701</NoWarn>
10-
<TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
11-
</PropertyGroup>
12-
13-
<PropertyGroup Label="NuGet">
14-
<Authors>John Bazinga, Andrii Chebukin, Jurii Chebukin, Ismael Carlos Velten, njlr, Garrett Birkel</Authors>
15-
<Product>FSharp.Data.GraphQL</Product>
16-
<Summary>F# implementation of Facebook GraphQL query language</Summary>
17-
18-
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot>
19-
<RepositoryUrl>https://github.com/fsprojects/FSharp.Data.GraphQL</RepositoryUrl>
20-
<RepositoryType>git</RepositoryType>
21-
<Version>2.0.0</Version>
22-
<PackageTags>FSharp GraphQL Relay React Middleware</PackageTags>
23-
<PackageReadmeFile>README.md</PackageReadmeFile>
24-
<PackageIcon>icon.png</PackageIcon>
25-
<!--<PackageIconUrl>https://www.newtonsoft.com/content/images/nugeticon.png</PackageIconUrl>-->
26-
<PackageProjectUrl>https://fsprojects.github.io/FSharp.Data.GraphQL</PackageProjectUrl>
27-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
28-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
29-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30-
<IncludeSymbols>true</IncludeSymbols>
31-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33-
34-
<MinVerTagPrefix>v</MinVerTagPrefix>
35-
</PropertyGroup>
36-
37-
<ItemGroup>
38-
<None Include="$(RepoRoot)\icon.png" Pack="true" PackagePath="\" />
39-
<None Include="$(RepoRoot)\README.md" Pack="true" PackagePath="\" />
40-
</ItemGroup>
41-
423
</Project>

‎FSharp.Data.GraphQL.sln‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
9+
Directory.Build.props = Directory.Build.props
910
Directory.Build.targets = Directory.Build.targets
1011
global.json = global.json
1112
LICENSE.txt = LICENSE.txt
@@ -261,30 +262,6 @@ Global
261262
{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x64.Build.0 = Release|Any CPU
262263
{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x86.ActiveCfg = Release|Any CPU
263264
{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x86.Build.0 = Release|Any CPU
264-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
265-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|Any CPU.Build.0 = Debug|Any CPU
266-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x64.ActiveCfg = Debug|Any CPU
267-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x64.Build.0 = Debug|Any CPU
268-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x86.ActiveCfg = Debug|Any CPU
269-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x86.Build.0 = Debug|Any CPU
270-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|Any CPU.ActiveCfg = Release|Any CPU
271-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|Any CPU.Build.0 = Release|Any CPU
272-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.ActiveCfg = Release|Any CPU
273-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
274-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
275-
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
276-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
277-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
278-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.ActiveCfg = Debug|Any CPU
279-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.Build.0 = Debug|Any CPU
280-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.ActiveCfg = Debug|Any CPU
281-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.Build.0 = Debug|Any CPU
282-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
283-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.Build.0 = Release|Any CPU
284-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.ActiveCfg = Release|Any CPU
285-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.Build.0 = Release|Any CPU
286-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.ActiveCfg = Release|Any CPU
287-
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.Build.0 = Release|Any CPU
288265
{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
289266
{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|Any CPU.Build.0 = Debug|Any CPU
290267
{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -330,11 +307,6 @@ Global
330307
{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
331308
{CAE5916B-1415-4982-B705-7318D77C029C} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
332309
{3D948D55-3CD2-496D-A04C-3B4E7BB69140} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
333-
{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
334-
{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
335-
{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
336-
{CAE5916B-1415-4982-B705-7318D77C029C} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
337-
{3D948D55-3CD2-496D-A04C-3B4E7BB69140} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
338310
{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
339311
{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
340312
{600D4BE2-FCE0-4684-AC6F-2DC829B395BA} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}

‎src/FSharp.Data.GraphQL.Server.Middleware/FSharp.Data.GraphQL.Server.Middleware.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
55
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

‎src/FSharp.Data.GraphQL.Server.Relay/FSharp.Data.GraphQL.Server.Relay.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

‎src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

‎src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(PackageTargetFrameworks)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

0 commit comments

Comments
 (0)