Skip to content

Commit f6354ed

Browse files
ssgssg
committed
consolidate nuspec and AssemblyInfo in csproj
1 parent ad6b29c commit f6354ed

File tree

5 files changed

+47
-97
lines changed

5 files changed

+47
-97
lines changed

‎SimpleBase.nuspec

-37
This file was deleted.

‎SimpleBase.sln

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
appveyor.yml = appveyor.yml
1515
LICENSE.txt = LICENSE.txt
1616
README.md = README.md
17-
SimpleBase.nuspec = SimpleBase.nuspec
1817
SimpleBase.snk = SimpleBase.snk
1918
EndProjectSection
2019
EndProject

‎pack.cmd

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
@echo off
2-
dotnet restore
3-
dotnet build -c Release
4-
xcopy /i /y src\bin\Release\netstandard2.0\* src\bin\Release\net45
5-
nuget pack SimpleBase.nuspec
2+
dotnet pack src -c Release -o ..

‎src/Properties/AssemblyInfo.cs

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
11
using System;
2-
using System.Reflection;
32
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
53

6-
// force the library to be compatible with .NET languages
7-
// other than C#
4+
// force compatibility with non-C#
85
[assembly: CLSCompliant(true)]
9-
10-
[assembly: AssemblyTitle("SimpleBase")]
11-
[assembly: AssemblyDescription("Base16/Base32/Base58 Encoding/Decoding Library")]
12-
[assembly: AssemblyProduct("SimpleBase")]
13-
[assembly: AssemblyCopyright("Copyright © 2014-2018 Sedat Kapanoglu")]
14-
15-
// Setting ComVisible to false makes the types in this assembly not visible
16-
// to COM components. If you need to access a type in this assembly from
17-
// COM, set the ComVisible attribute to true on that type.
18-
[assembly: ComVisible(false)]
19-
20-
// The following GUID is for the ID of the typelib if this project is exposed to COM
21-
[assembly: Guid("20592f17-d497-4dc4-9483-52911171f130")]
22-
23-
[assembly: AssemblyVersion("1.6.0")]
24-
[assembly: AssemblyFileVersion("1.6.0")]
25-
266
[assembly: InternalsVisibleTo("SimpleBaseTest, PublicKey=0024000004800000140100000602000000240000525341310008000001000100612a9127f475475ffe4a714331c292aeb9e670d2ae238e869142c4517eaa1d4fc4ef75682cd225276aebff330203bd5ef86e3efb2f4fbe13977f94e715a60f5263ff357a8f610ffee280a446ff67c3800cd7d4ca20e7040c107a6b6a83da50427966a822c20c06c57b88e5dde58f3a44623e49ad0bf089a526b83100dc1fc78f6a75ffaa34e764075726e58e1e5fb01ec0c4c9274e99b3136cbbbd25f1fd0302b62bff2fffc3667a4214f58d19d5d06a30b9de959a054823fbb2c0d011f29c928ce9eeb93a88189a3e5ed135f4f3fff3aec36282e6d1acdf8a8c076ab8860498c4b734a19fd214187b4d9823f6b9b52d913307351f9cd9c66d29c258247824c1")]

‎src/SimpleBase.csproj

+45-34
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<RootNamespace>SimpleBase</RootNamespace>
5+
<AssemblyName>SimpleBase</AssemblyName>
6+
<Copyright>Copyright 2014-2018 Sedat Kapanoglu</Copyright>
7+
<Authors>Sedat Kapanoglu</Authors>
8+
<Description>Base16, Base32, Base58, Base85 encoding/decoding library</Description>
9+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10+
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
11+
<SignAssembly>true</SignAssembly>
12+
<AssemblyOriginatorKeyFile>..\SimpleBase.snk</AssemblyOriginatorKeyFile>
13+
<DelaySign>false</DelaySign>
214

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
<RootNamespace>SimpleBase</RootNamespace>
6-
<AssemblyName>SimpleBase</AssemblyName>
7-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<SignAssembly>true</SignAssembly>
10-
<AssemblyOriginatorKeyFile>..\SimpleBase.snk</AssemblyOriginatorKeyFile>
11-
<DelaySign>false</DelaySign>
12-
</PropertyGroup>
15+
<PackageVersion>1.7.1</PackageVersion>
16+
<PackageProjectUrl>https://github.com/ssg/SimpleBase</PackageProjectUrl>
17+
<PackageLicense>Apache-2.0</PackageLicense>
18+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
19+
<PackageTags>base16 base32 base58 base85 ascii85 z85 hexadecimal bitcoin ripple flickr crockford extended hex rfc4648</PackageTags>
20+
<PackageReleaseNotes><![CDATA[
21+
- Minor code analysis fixes
22+
]]></PackageReleaseNotes>
23+
</PropertyGroup>
1324

14-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
15-
<LangVersion>latest</LangVersion>
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
26+
<LangVersion>latest</LangVersion>
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
</PropertyGroup>
1829

19-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
20-
<LangVersion>latest</LangVersion>
21-
</PropertyGroup>
30+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
31+
<LangVersion>latest</LangVersion>
32+
</PropertyGroup>
2233

23-
<ItemGroup>
24-
<None Remove="SimpleBase.net45.v3.ncrunchproject" />
25-
<None Remove="SimpleBase.netstandard1.3.v3.ncrunchproject" />
26-
</ItemGroup>
34+
<ItemGroup>
35+
<None Remove="SimpleBase.net45.v3.ncrunchproject" />
36+
<None Remove="SimpleBase.netstandard1.3.v3.ncrunchproject" />
37+
</ItemGroup>
2738

28-
<ItemGroup>
29-
<None Include="..\SimpleBase.snk" Link="SimpleBase.snk" />
30-
</ItemGroup>
39+
<ItemGroup>
40+
<None Include="..\SimpleBase.snk" Link="SimpleBase.snk" />
41+
</ItemGroup>
3142

32-
<ItemGroup>
33-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
34-
<PrivateAssets>all</PrivateAssets>
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
36-
</PackageReference>
37-
<PackageReference Include="System.Memory" Version="4.5.1" />
38-
<PackageReference Include="System.Runtime.Numerics">
39-
<Version>4.3.0</Version>
40-
</PackageReference>
41-
</ItemGroup>
43+
<ItemGroup>
44+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
45+
<PrivateAssets>all</PrivateAssets>
46+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
47+
</PackageReference>
48+
<PackageReference Include="System.Memory" Version="4.5.1" />
49+
<PackageReference Include="System.Runtime.Numerics">
50+
<Version>4.3.0</Version>
51+
</PackageReference>
52+
</ItemGroup>
4253
</Project>

0 commit comments

Comments
 (0)