Skip to content

Commit

Permalink
consolidate nuspec and AssemblyInfo in csproj
Browse files Browse the repository at this point in the history
  • Loading branch information
ssg committed Dec 4, 2018
1 parent ad6b29c commit f6354ed
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 97 deletions.
37 changes: 0 additions & 37 deletions SimpleBase.nuspec

This file was deleted.

1 change: 0 additions & 1 deletion SimpleBase.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
appveyor.yml = appveyor.yml
LICENSE.txt = LICENSE.txt
README.md = README.md
SimpleBase.nuspec = SimpleBase.nuspec
SimpleBase.snk = SimpleBase.snk
EndProjectSection
EndProject
Expand Down
5 changes: 1 addition & 4 deletions pack.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
@echo off
dotnet restore
dotnet build -c Release
xcopy /i /y src\bin\Release\netstandard2.0\* src\bin\Release\net45
nuget pack SimpleBase.nuspec
dotnet pack src -c Release -o ..
22 changes: 1 addition & 21 deletions src/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// force the library to be compatible with .NET languages
// other than C#
// force compatibility with non-C#
[assembly: CLSCompliant(true)]

[assembly: AssemblyTitle("SimpleBase")]
[assembly: AssemblyDescription("Base16/Base32/Base58 Encoding/Decoding Library")]
[assembly: AssemblyProduct("SimpleBase")]
[assembly: AssemblyCopyright("Copyright © 2014-2018 Sedat Kapanoglu")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("20592f17-d497-4dc4-9483-52911171f130")]

[assembly: AssemblyVersion("1.6.0")]
[assembly: AssemblyFileVersion("1.6.0")]

[assembly: InternalsVisibleTo("SimpleBaseTest, PublicKey=0024000004800000140100000602000000240000525341310008000001000100612a9127f475475ffe4a714331c292aeb9e670d2ae238e869142c4517eaa1d4fc4ef75682cd225276aebff330203bd5ef86e3efb2f4fbe13977f94e715a60f5263ff357a8f610ffee280a446ff67c3800cd7d4ca20e7040c107a6b6a83da50427966a822c20c06c57b88e5dde58f3a44623e49ad0bf089a526b83100dc1fc78f6a75ffaa34e764075726e58e1e5fb01ec0c4c9274e99b3136cbbbd25f1fd0302b62bff2fffc3667a4214f58d19d5d06a30b9de959a054823fbb2c0d011f29c928ce9eeb93a88189a3e5ed135f4f3fff3aec36282e6d1acdf8a8c076ab8860498c4b734a19fd214187b4d9823f6b9b52d913307351f9cd9c66d29c258247824c1")]
79 changes: 45 additions & 34 deletions src/SimpleBase.csproj
Original file line number Diff line number Diff line change
@@ -1,42 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>SimpleBase</RootNamespace>
<AssemblyName>SimpleBase</AssemblyName>
<Copyright>Copyright 2014-2018 Sedat Kapanoglu</Copyright>
<Authors>Sedat Kapanoglu</Authors>
<Description>Base16, Base32, Base58, Base85 encoding/decoding library</Description>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\SimpleBase.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>SimpleBase</RootNamespace>
<AssemblyName>SimpleBase</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\SimpleBase.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
</PropertyGroup>
<PackageVersion>1.7.1</PackageVersion>
<PackageProjectUrl>https://github.com/ssg/SimpleBase</PackageProjectUrl>
<PackageLicense>Apache-2.0</PackageLicense>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTags>base16 base32 base58 base85 ascii85 z85 hexadecimal bitcoin ripple flickr crockford extended hex rfc4648</PackageTags>
<PackageReleaseNotes><![CDATA[
- Minor code analysis fixes
]]></PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<LangVersion>latest</LangVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<LangVersion>latest</LangVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<None Remove="SimpleBase.net45.v3.ncrunchproject" />
<None Remove="SimpleBase.netstandard1.3.v3.ncrunchproject" />
</ItemGroup>
<ItemGroup>
<None Remove="SimpleBase.net45.v3.ncrunchproject" />
<None Remove="SimpleBase.netstandard1.3.v3.ncrunchproject" />
</ItemGroup>

<ItemGroup>
<None Include="..\SimpleBase.snk" Link="SimpleBase.snk" />
</ItemGroup>
<ItemGroup>
<None Include="..\SimpleBase.snk" Link="SimpleBase.snk" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.Numerics">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="System.Runtime.Numerics">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
</Project>

0 comments on commit f6354ed

Please sign in to comment.