diff options
| -rw-r--r-- | appveyor.yml | 15 | ||||
| -rw-r--r-- | crypto/src/AssemblyInfo.cs | 59 | ||||
| -rw-r--r-- | crypto/src/crypto.csproj | 35 |
3 files changed, 12 insertions, 97 deletions
diff --git a/appveyor.yml b/appveyor.yml index 9c11af418..3b2c5ce98 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,23 +6,18 @@ environment: secure: S26+NphAhj/vo5ZdHd/N/4toty3ztdNGmuNdvAB57W1oIVQEHVKqAVuhTD8B9ATy install: - - cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v3.5.0/NuGet.exe + - cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v4.0.0/NuGet.exe - cmd: nuget install gitlink -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion - - cmd: nuget install GitVersion.CommandLine -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion - cmd: nuget install SignClient -Version 0.5.0-beta4 -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion -pre assembly_info: patch: false - -before_build: - - cmd: '.\packages\GitVersion.CommandLine\tools\GitVersion.exe /l console /output buildserver /updateAssemblyInfo' - + build_script: - cmd: dotnet restore BouncyCastle.sln - - cmd: dotnet build BouncyCastle.sln -c Release + - cmd: dotnet pack BouncyCastle.sln -c Release /p:PackageId="Portable.BouncyCastle" /p:PackageOutputPath="%APPVEYOR_BUILD_FOLDER%" after_build: - - cmd: '.\packages\gitlink\lib\net45\GitLink.exe . -f BouncyCastle.sln -u https://github.com/onovotny/bc-csharp -c Release -s %APPVEYOR_REPO_COMMIT% -errorsaswarnings' - - cmd: nuget pack Portable.BouncyCastle.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%" + - cmd: '.\packages\gitlink\lib\net45\GitLink.exe . -f BouncyCastle.sln -u https://github.com/onovotny/bc-csharp -c Release -s %APPVEYOR_REPO_COMMIT% -errorsaswarnings' - ps: '.\scripts\Sign-Package.ps1' - - ps: 'cmd /c "appveyor PushArtifact Portable.BouncyCastle.%GitVersion_NuGetVersion%.nupkg";if($lastexitcode -ne 0){$lastexitcode = 0}' \ No newline at end of file + - ps: 'cmd /c "appveyor PushArtifact Portable.BouncyCastle.*.nupkg";if($lastexitcode -ne 0){$lastexitcode = 0}' \ No newline at end of file diff --git a/crypto/src/AssemblyInfo.cs b/crypto/src/AssemblyInfo.cs index 053364594..022895b0a 100644 --- a/crypto/src/AssemblyInfo.cs +++ b/crypto/src/AssemblyInfo.cs @@ -9,65 +9,6 @@ using System.Linq; using System.Runtime.InteropServices; #endif -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("BouncyCastle.Crypto")] -[assembly: AssemblyDescription("Bouncy Castle Cryptography API")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Legion of the Bouncy Castle Inc.")] -[assembly: AssemblyProduct("Bouncy Castle for .NET")] -[assembly: AssemblyCopyright("Copyright (C) 2000-2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.15362.1")] -[assembly: AssemblyInformationalVersion("1.8.1")] - -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project output directory which is -// %Project Directory%\obj\<configuration>. For example, if your KeyFile is -// located in the project directory, you would specify the AssemblyKeyFile -// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// -[assembly: AssemblyDelaySign(false)] -#if STRONG_NAME -[assembly: AssemblyKeyFile(@"../BouncyCastle.snk")] -#endif - [assembly: CLSCompliant(true)] #if !PORTABLE [assembly: ComVisible(false)] diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj index afbee9d5c..6175a6db2 100644 --- a/crypto/src/crypto.csproj +++ b/crypto/src/crypto.csproj @@ -5,22 +5,10 @@ <RootNamespace>crypto</RootNamespace> <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> - <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> - <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> - <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> - <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> - <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> - <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> - <GenerateAssemblyTrademarkAttribute>false</GenerateAssemblyTrademarkAttribute> - <GenerateAssemblyCultureAttribute>false</GenerateAssemblyCultureAttribute> - <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> - <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute> - <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == 'portable-net4+sl5+wp8+win8+wpa81'"> - <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile328</TargetFrameworkProfile> + <Product>Bouncy Castle for .NET ($(TargetFramework))</Product> + <Copyright>Copyright (C) 2000-2017</Copyright> + <Company>The Legion of the Bouncy Castle Inc.</Company> + <Description>Bouncy Castle Cryptography API</Description> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <GenerateDocumentationFile>true</GenerateDocumentationFile> @@ -41,17 +29,8 @@ <ItemGroup> <Compile Include="..\bzip2\src\**\*.cs" /> <None Include="..\..\BouncyCastle.snk" /> + <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" /> + <PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0-rc4-31" PrivateAssets="All" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net4' "> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'portable-net4+sl5+wp8+win8+wpa81' "> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml" /> - </ItemGroup> + <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" /> </Project> \ No newline at end of file |