Skip to content

Commit 1282d9a

Browse files
angularsenangularsen
committed
Remove signed projects
- Merge Common.props files into .csproj - Remove projects from solution
1 parent 472fe88 commit 1282d9a

7 files changed

+81
-151
lines changed

‎UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props

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

‎UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Signed.csproj

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

‎UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,46 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="UnitsNet.Serialization.JsonNet.Common.props" />
2+
<!-- NuGet properties -->
33
<PropertyGroup>
4+
<PackageId>UnitsNet.Serialization.JsonNet</PackageId>
5+
<Version>4.0.0-alpha4</Version>
6+
<Authors>Andreas Gullberg Larsen</Authors>
7+
<Title>Units.NET Serialization with Json.NET</Title>
8+
<Description>A helper library for serializing and deserializing types in Units.NET using Json.NET.</Description>
9+
<Copyright>Copyright (c) 2015 Andreas Gullberg Larsen</Copyright>
10+
<IncludeSymbols>true</IncludeSymbols>
11+
<IncludeSource>true</IncludeSource>
12+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
13+
<RepositoryUrl>https://github.com/angularsen/UnitsNet</RepositoryUrl>
14+
<PackageIconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</PackageIconUrl>
15+
<PackageProjectUrl>https://github.com/angularsen/UnitsNet</PackageProjectUrl>
16+
<PackageLicenseUrl>https://github.com/angularsen/UnitsNet/blob/master/LICENSE</PackageLicenseUrl>
17+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
18+
<PackageTags>unit units measurement json Json.NET Newtonsoft serialize deserialize serialization deserialization</PackageTags>
19+
</PropertyGroup>
20+
21+
<!-- Assembly and msbuild properties -->
22+
<PropertyGroup>
23+
<AssemblyVersion>4.0.0.0</AssemblyVersion> <!-- Should reflect major part of Version -->
424
<LangVersion>7.3</LangVersion>
5-
<SignAssembly>true</SignAssembly>
25+
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
26+
<RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
27+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
28+
</PropertyGroup>
29+
30+
<!-- Strong name signing -->
31+
<PropertyGroup>
632
<AssemblyOriginatorKeyFile>../UnitsNet.snk</AssemblyOriginatorKeyFile>
733
<DelaySign>false</DelaySign>
34+
<SignAssembly>true</SignAssembly>
835
</PropertyGroup>
936

10-
<!-- Unsigned project references, will also generate the corresponding nuget dependencies -->
37+
<!-- NuGet references that work for both signed and unsigned -->
38+
<ItemGroup>
39+
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
40+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
41+
</ItemGroup>
42+
43+
<!-- Project references, will also generate the corresponding nuget dependencies -->
1144
<ItemGroup>
1245
<ProjectReference Include="..\UnitsNet\UnitsNet.csproj" />
1346
</ItemGroup>

‎UnitsNet.sln

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet", "UnitsNet\UnitsN
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Serialization.JsonNet", "UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.csproj", "{FB696BFE-B303-4EBD-A0E6-4A7B19DE429B}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Serialization.JsonNet.Signed", "UnitsNet.Serialization.JsonNet\UnitsNet.Serialization.JsonNet.Signed.csproj", "{7798DBCF-DD59-4CAD-A754-FB7DCC6BD312}"
11-
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Signed", "UnitsNet\UnitsNet.Signed.csproj", "{21C1AFDC-354E-4D97-947B-2DB63C529E6E}"
13-
EndProject
1410
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Serialization.JsonNet.Tests", "UnitsNet.Serialization.JsonNet.Tests\UnitsNet.Serialization.JsonNet.Tests.csproj", "{FFEEDF44-F32D-4D92-A75E-487CB0582EB1}"
1511
EndProject
1612
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Tests", "UnitsNet.Tests\UnitsNet.Tests.csproj", "{0E3B7567-5DF2-44BD-88DB-CCF050D3F943}"
@@ -31,14 +27,6 @@ Global
3127
{FB696BFE-B303-4EBD-A0E6-4A7B19DE429B}.Debug|Any CPU.Build.0 = Debug|Any CPU
3228
{FB696BFE-B303-4EBD-A0E6-4A7B19DE429B}.Release|Any CPU.ActiveCfg = Release|Any CPU
3329
{FB696BFE-B303-4EBD-A0E6-4A7B19DE429B}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{7798DBCF-DD59-4CAD-A754-FB7DCC6BD312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{7798DBCF-DD59-4CAD-A754-FB7DCC6BD312}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{7798DBCF-DD59-4CAD-A754-FB7DCC6BD312}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{7798DBCF-DD59-4CAD-A754-FB7DCC6BD312}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{21C1AFDC-354E-4D97-947B-2DB63C529E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{21C1AFDC-354E-4D97-947B-2DB63C529E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{21C1AFDC-354E-4D97-947B-2DB63C529E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{21C1AFDC-354E-4D97-947B-2DB63C529E6E}.Release|Any CPU.Build.0 = Release|Any CPU
4230
{FFEEDF44-F32D-4D92-A75E-487CB0582EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4331
{FFEEDF44-F32D-4D92-A75E-487CB0582EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
4432
{FFEEDF44-F32D-4D92-A75E-487CB0582EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎UnitsNet/UnitsNet.Common.props

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,2 @@
11
<Project>
2-
<!-- NuGet properties -->
3-
<PropertyGroup>
4-
<PackageId>UnitsNet</PackageId>
5-
<Version>4.0.0-alpha5</Version>
6-
<Authors>Andreas Gullberg Larsen</Authors>
7-
<Title>Units.NET</Title>
8-
<Description>Get all the common units of measurement and the conversions between them. It is light-weight and thoroughly tested.</Description>
9-
<Copyright>Copyright (c) 2013 Andreas Gullberg Larsen</Copyright>
10-
<IncludeSymbols>true</IncludeSymbols>
11-
<IncludeSource>true</IncludeSource>
12-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
13-
<RepositoryUrl>https://github.com/angularsen/UnitsNet</RepositoryUrl>
14-
<PackageIconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</PackageIconUrl>
15-
<PackageProjectUrl>https://github.com/angularsen/UnitsNet</PackageProjectUrl>
16-
<PackageLicenseUrl>https://github.com/angularsen/UnitsNet/blob/master/LICENSE</PackageLicenseUrl>
17-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
18-
<PackageTags>unit units quantity quantities measurement si metric imperial abbreviation abbreviations convert conversion parse immutable</PackageTags>
19-
</PropertyGroup>
20-
21-
<!-- Assembly and msbuild properties -->
22-
<PropertyGroup>
23-
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
24-
<AssemblyVersion>4.0.0.0</AssemblyVersion> <!-- Should reflect major part of Version -->
25-
<RootNamespace>UnitsNet</RootNamespace>
26-
<NoWarn>CS1701;CS1702;CS1705;CS0618;CS0809;CS1591</NoWarn>
27-
</PropertyGroup>
28-
29-
<!-- NuGet references that work for both signed and unsigned -->
30-
<ItemGroup>
31-
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
32-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
33-
</ItemGroup>
34-
35-
<!-- Exclude obj folder from default inclusion pattern -->
36-
<ItemGroup>
37-
<Compile Include="..\Common\**\*.cs" Exclude="**\obj\**">
38-
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
39-
</Compile>
40-
<None Include="..\Common\**\*" Exclude="**\obj\**">
41-
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
42-
</None>
43-
<Compile Remove="obj\**" />
44-
<Compile Remove="Properties\AssemblyInfo*.cs" />
45-
<EmbeddedResource Remove="obj\**" />
46-
<None Remove="obj\**" />
47-
</ItemGroup>
48-
492
</Project>

‎UnitsNet/UnitsNet.Signed.csproj

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

‎UnitsNet/UnitsNet.csproj

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,51 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<!-- NuGet properties -->
23
<PropertyGroup>
4+
<PackageId>UnitsNet</PackageId>
5+
<Version>4.0.0-alpha5</Version>
6+
<Authors>Andreas Gullberg Larsen</Authors>
7+
<Title>Units.NET</Title>
8+
<Description>Get all the common units of measurement and the conversions between them. It is light-weight and thoroughly tested.</Description>
9+
<Copyright>Copyright (c) 2013 Andreas Gullberg Larsen</Copyright>
10+
<IncludeSymbols>true</IncludeSymbols>
11+
<IncludeSource>true</IncludeSource>
12+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
13+
<RepositoryUrl>https://github.com/angularsen/UnitsNet</RepositoryUrl>
14+
<PackageIconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</PackageIconUrl>
15+
<PackageProjectUrl>https://github.com/angularsen/UnitsNet</PackageProjectUrl>
16+
<PackageLicenseUrl>https://github.com/angularsen/UnitsNet/blob/master/LICENSE</PackageLicenseUrl>
17+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
18+
<PackageTags>unit units quantity quantities measurement si metric imperial abbreviation abbreviations convert conversion parse immutable</PackageTags>
19+
</PropertyGroup>
20+
21+
<!-- Assembly and msbuild properties -->
22+
<PropertyGroup>
23+
<AssemblyVersion>4.0.0.0</AssemblyVersion> <!-- Should reflect major part of Version -->
324
<LangVersion>7.3</LangVersion>
4-
<SignAssembly>true</SignAssembly>
5-
<DelaySign>false</DelaySign>
25+
<NoWarn>CS1701;CS1702;CS1705;CS0618;CS0809;CS1591</NoWarn>
26+
<RootNamespace>UnitsNet</RootNamespace>
27+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
28+
</PropertyGroup>
29+
30+
<!-- Strong name signing -->
31+
<PropertyGroup>
632
<AssemblyOriginatorKeyFile>../UnitsNet.snk</AssemblyOriginatorKeyFile>
33+
<DelaySign>false</DelaySign>
34+
<SignAssembly>true</SignAssembly>
735
</PropertyGroup>
8-
<Import Project="UnitsNet.Common.props" />
36+
37+
<!-- NuGet references that work for both signed and unsigned -->
38+
<ItemGroup>
39+
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
40+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
41+
</ItemGroup>
42+
43+
<!-- Link in common .json files, exclude WindowsRuntimeComponent files -->
44+
<ItemGroup>
45+
<None Include="..\Common\**\*">
46+
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
47+
</None>
48+
<Compile Remove="Properties\AssemblyInfo.WindowsRuntimeComponent.cs" />
49+
</ItemGroup>
50+
951
</Project>

0 commit comments

Comments
 (0)