merge, fixes #3

AssemblyInfo.Shared.cs

@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]

Certes.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{E9E7371E-AB81-4ECF-9684-2ACB1EF7FF67}"
  ProjectSection(SolutionItems) = preProject

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Certes Project
+Copyright (c) 2017 Certes Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

appveyor.yml

@@ -17,14 +17,16 @@ branches:
  - dev
 
 assembly_info:
- patch: false
- # file: AssemblyInfo.*
+ patch: true
+ file: '**\AssemblyInfo.*'
+ assembly_version: '{version}'
+ assembly_file_version: '{version}'
+ assembly_informational_version: $(CERTES_PACKAGE_VERSION)
 
 init:
  - git config --global core.autocrlf input
  - ps: $packageVersionSuffix = if ($env:APPVEYOR_REPO_BRANCH -eq "master") { "" } else { "$($env:APPVEYOR_REPO_BRANCH)" }
- - ps: $packageVersion = if ($env:APPVEYOR_REPO_BRANCH -eq "master") { "$($env:appveyor_build_version)" } else { "$($env:appveyor_build_version)-$($env:APPVEYOR_REPO_BRANCH)" }
- - ps: Update-AppveyorBuild -Version "$env:appveyor_build_version"
+ - ps: $packageVersion = $($env:appveyor_build_version)
  - ps: $env:CERTES_PACKAGE_VERSION = $packageVersion
 
 install:

src/Certes.Cli/Certes.Cli.csproj

@@ -1,28 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp1.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <AssemblyName>Certes.Cli</AssemblyName>
  <OutputType>Exe</OutputType>
- <PackageId>Certes.Cli</PackageId>
- <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
- <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
- <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
- <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+ <TargetFramework>netcoreapp1.0</TargetFramework>
+ <Version>1.0.0</Version>
+ <Authors>Eddie Lin</Authors>
+ <Company />
+ <Product>CLI for Certes</Product>
+ <Description>CLI for Certes</Description>
+ <PackageProjectUrl>https://github.com/fszlin/certes</PackageProjectUrl>
+ <PackageLicenseUrl>https://github.com/fszlin/certes/blob/master/LICENSE</PackageLicenseUrl>
+ <PackageTags>Certes;letsencrypt;ACME;HTTPS;SSL;Certificate</PackageTags>
+ <RepositoryType>git</RepositoryType>
+ <RepositoryUrl>https://github.com/fszlin/certes</RepositoryUrl>
  <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+ <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+ <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+ <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\Certes\Certes.csproj" />
+ <Compile Include="..\..\AssemblyInfo.Shared.cs" Link="Properties\AssemblyInfo.Shared.cs" />
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="NLog" Version="5.0.0-beta03-tryoutMutex" />
- <PackageReference Include="System.CommandLine" Version="0.1.0-e161104-2" />
+ <PackageReference Include="NLog" Version="5.0.0-beta06" />
+ <PackageReference Include="System.CommandLine" Version="0.1.0-e170328-3" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\Certes\Certes.csproj" />
  </ItemGroup>
 
-</Project>
+</Project>

src/Certes.Cli/Properties/AssemblyInfo.cs

@@ -1,19 +1,3 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-// 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: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Certes.Cli")]
-[assembly: AssemblyTrademark("")]
-
-// 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("23fd2074-1b0f-495a-831e-7a0d645cdf88")]
-[assembly: AssemblyVersion("1.0")]

src/Certes/Certes.csproj

@@ -1,36 +1,57 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <Description>A client implantation for the Automated Certificate Management Environment (ACME) protocol</Description>
- <AssemblyTitle>Certes ACME Client</AssemblyTitle>
  <TargetFramework>netstandard1.3</TargetFramework>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <AssemblyName>Certes</AssemblyName>
- <PackageId>Certes</PackageId>
+ <Version>1.0.0</Version>
+ <Authors>Eddie Lin</Authors>
+ <Company />
+ <Product>Certes ACME Client</Product>
+ <Description>A client implantation for the Automated Certificate Management Environment (ACME) protocol</Description>
  <PackageTags>Certes;letsencrypt;ACME;HTTPS;SSL;Certificate</PackageTags>
  <PackageProjectUrl>https://github.com/fszlin/certes</PackageProjectUrl>
  <PackageLicenseUrl>https://github.com/fszlin/certes/blob/master/LICENSE</PackageLicenseUrl>
  <RepositoryType>git</RepositoryType>
  <RepositoryUrl>https://github.com/fszlin/certes</RepositoryUrl>
- <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
- <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
- <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
- <Authors>Eddie Lin</Authors>
+ <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+ <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <FileVersion>1.0.5.0</FileVersion>
- <Version>1.0.5</Version>
+ <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+
+</PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <DocumentationFile>bin\Release\netstandard1.3\Certes.xml</DocumentationFile>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <DocumentationFile>bin\Debug\netstandard1.3\Certes.xml</DocumentationFile>
+ <TreatSpecificWarningsAsErrors />
  </PropertyGroup>
 
  <ItemGroup>
- <EmbeddedResource Include="Resources\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+ <None Remove="Resources\Certificates\dst-root-ca-x3.cer" />
+ <None Remove="Resources\Certificates\fake-le-intermediate-x1.cer" />
+ <None Remove="Resources\Certificates\fake-le-root-x1.cer" />
+ <None Remove="Resources\Certificates\lets-encrypt-x3-cross-signed.cer" />
+ <None Remove="Resources\Certificates\lets-encrypt-x4-cross-signed.cer" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Include="..\..\AssemblyInfo.Shared.cs" Link="Properties\AssemblyInfo.Shared.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\Certificates\dst-root-ca-x3.cer" />
+ <EmbeddedResource Include="Resources\Certificates\fake-le-intermediate-x1.cer" />
+ <EmbeddedResource Include="Resources\Certificates\fake-le-root-x1.cer" />
+ <EmbeddedResource Include="Resources\Certificates\lets-encrypt-x3-cross-signed.cer" />
+ <EmbeddedResource Include="Resources\Certificates\lets-encrypt-x4-cross-signed.cer" />
  </ItemGroup>
 
  <ItemGroup>
  <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
  <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
- <PackageReference Include="System.Net.Http" Version="4.3.1" />
  </ItemGroup>
 
-</Project>
+</Project>

src/Certes/Properties/AssemblyInfo.cs

@@ -1,21 +1,5 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// 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: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Certes")]
-[assembly: AssemblyTrademark("")]
-
-// 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("5f6267a0-a6c5-4d1e-b7ff-f8f8d09d8588")]
 [assembly: InternalsVisibleTo("Certes.Tests")]
-[assembly: AssemblyVersion("1.0.5")]

test/Certes.Tests/Certes.Tests.csproj

@@ -1,33 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <PropertyGroup>
+ <PropertyGroup> 
  <TargetFramework>netcoreapp1.1</TargetFramework>
- <AssemblyName>Certes.Tests</AssemblyName>
- <PackageId>Certes.Tests</PackageId>
- <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
- <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
- <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
- <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
- <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  </PropertyGroup>
 
  <ItemGroup>
- <ProjectReference Include="..\..\src\Certes\Certes.csproj" />
- <ProjectReference Include="..\..\src\Certes.Cli\Certes.Cli.csproj" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+ <PackageReference Include="Moq" Version="4.7.8" />
+ <PackageReference Include="xunit" Version="2.2.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
- <PackageReference Include="xunit" Version="2.2.0" />
- <PackageReference Include="Moq" Version="4.7.1" />
- <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
- <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
+ <ProjectReference Include="..\..\src\Certes.Cli\Certes.Cli.csproj" />
+ <ProjectReference Include="..\..\src\Certes\Certes.csproj" />
  </ItemGroup>
 
  <ItemGroup>
  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
  </ItemGroup>
 
+ <ItemGroup>
+ <Folder Include="Properties\" />
+ </ItemGroup>
+
 </Project>