Skip to content

Commit 5d4b4e6

Browse files
xivkxivk
committed
Upgraded to csproj system, added netstandard2.0.
1 parent e76a3a0 commit 5d4b4e6

File tree

8 files changed

+81
-137
lines changed

8 files changed

+81
-137
lines changed

‎JsonLD.sln‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28010.2026
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "json-ld.net", "src\json-ld.net\json-ld.net.xproj", "{E1AB2A29-D1E4-45A1-9076-8255916F5693}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net", "src\json-ld.net\json-ld.net.csproj", "{E1AB2A29-D1E4-45A1-9076-8255916F5693}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "json-ld.net.tests", "test\json-ld.net.tests\json-ld.net.tests.xproj", "{05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "json-ld.net.tests", "test\json-ld.net.tests\json-ld.net.tests.csproj", "{05CBE0E2-FBD2-40D1-BD9A-D30BD7ACF219}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +25,7 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {F10834B6-ACA3-4C86-892B-368D0B68ED83}
30+
EndGlobalSection
2831
EndGlobal

‎src/json-ld.net/json-ld.net.csproj‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>JSON-LD processor for .NET
5+
6+
Implements the W3C JSON-LD 1.0 standard.</Description>
7+
<VersionPrefix>1.0.6</VersionPrefix>
8+
<Authors>NuGet;linked-data-dotnet</Authors>
9+
<TargetFrameworks>net40-client;portable45-net45+win8;netstandard1.3;netstandard2.0</TargetFrameworks>
10+
<AssemblyName>json-ld.net</AssemblyName>
11+
<PackageId>json-ld.net</PackageId>
12+
<PackageTags>json-ld;jsonld;json;linked-data;rdf;semantic;web</PackageTags>
13+
<PackageIconUrl>http://json-ld.org/images/json-ld-logo-64.png</PackageIconUrl>
14+
<PackageProjectUrl>https://github.com/linked-data-dotnet/json-ld.net/</PackageProjectUrl>
15+
<PackageLicenseUrl>https://raw.githubusercontent.com/linked-data-dotnet/json-ld.net/master/LICENSE</PackageLicenseUrl>
16+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
17+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
18+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
19+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
20+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net40-client' ">
28+
<Reference Include="System" />
29+
<Reference Include="Microsoft.CSharp" />
30+
</ItemGroup>
31+
32+
<PropertyGroup Condition=" '$(TargetFramework)' == 'portable45-net45+win8' ">
33+
<DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
34+
</PropertyGroup>
35+
36+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
37+
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
38+
</PropertyGroup>
39+
40+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
41+
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
42+
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.2.0" />
43+
<PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
44+
</ItemGroup>
45+
46+
</Project>

‎src/json-ld.net/json-ld.net.xproj‎

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

‎src/json-ld.net/project.json‎

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

‎test/global.json‎

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

‎test/json-ld.net.tests/json-ld.net.tests.csproj‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
5+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
6+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
7+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
8+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<None Update="NQuads\**;W3C\**">
13+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
14+
</None>
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\src\json-ld.net\json-ld.net.csproj" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
23+
<PackageReference Include="xunit" Version="2.3.1" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
25+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
26+
</ItemGroup>
27+
28+
</Project>

‎test/json-ld.net.tests/json-ld.net.tests.xproj‎

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

‎test/json-ld.net.tests/project.json‎

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

0 commit comments

Comments
 (0)