Skip to content

Commit

Permalink
revert changes for dotnetcore RTM, wait for build services to upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
fszlin committed Mar 13, 2017
1 parent 059fe7a commit f81abb8
Show file tree
Hide file tree
Showing 10 changed files with 184 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: csharp
mono: none
dotnet: 1.0.0
dotnet: 1.0.0-preview2-003131
sudo: required
dist: trusty
os:
Expand All @@ -26,7 +26,7 @@ branches:
- dev
script:
- dotnet restore
- dotnet test ./test/Certes.Tests/Certes.Tests.csproj
- dotnet test ./test/Certes.Tests/project.json --framework netcoreapp1.0
#- dotnet pack -c release -o ./build/nuget ./src/Certes/project.json --framework netcoreapp1.0
#- dotnet publish -f netcoreapp1.0 -c release -o ./build/cli/bin ./src/Certes.Cli/project.json

46 changes: 23 additions & 23 deletions Certes.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{E9E7371E-AB81-4ECF-9684-2ACB1EF7FF67}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -13,43 +13,43 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7B11358C-CCD
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{556F2BFB-DE9B-4673-BADC-63C365DA2A55}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Certes", "src\Certes\Certes.xproj", "{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Certes.Cli", "src\Certes.Cli\Certes.Cli.xproj", "{23FD2074-1B0F-495A-831E-7A0D645CDF88}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Certes.Tests", "test\Certes.Tests\Certes.Tests.xproj", "{9FDD9052-506D-460D-BF4A-142DAB517524}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E420B696-0E51-40E1-B534-96E66C2C27F5}"
ProjectSection(SolutionItems) = preProject
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes", "src\Certes\Certes.csproj", "{E2C42E77-1925-4E97-A37B-4125F124BDDF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Cli", "src\Certes.Cli\Certes.Cli.csproj", "{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Tests", "test\Certes.Tests\Certes.Tests.csproj", "{2E13AD77-F625-4B0A-A355-75421D4ABC6D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E2C42E77-1925-4E97-A37B-4125F124BDDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2C42E77-1925-4E97-A37B-4125F124BDDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2C42E77-1925-4E97-A37B-4125F124BDDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2C42E77-1925-4E97-A37B-4125F124BDDF}.Release|Any CPU.Build.0 = Release|Any CPU
{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{2E13AD77-F625-4B0A-A355-75421D4ABC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E13AD77-F625-4B0A-A355-75421D4ABC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E13AD77-F625-4B0A-A355-75421D4ABC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E13AD77-F625-4B0A-A355-75421D4ABC6D}.Release|Any CPU.Build.0 = Release|Any CPU
{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588}.Release|Any CPU.Build.0 = Release|Any CPU
{23FD2074-1B0F-495A-831E-7A0D645CDF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23FD2074-1B0F-495A-831E-7A0D645CDF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23FD2074-1B0F-495A-831E-7A0D645CDF88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23FD2074-1B0F-495A-831E-7A0D645CDF88}.Release|Any CPU.Build.0 = Release|Any CPU
{9FDD9052-506D-460D-BF4A-142DAB517524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FDD9052-506D-460D-BF4A-142DAB517524}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FDD9052-506D-460D-BF4A-142DAB517524}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FDD9052-506D-460D-BF4A-142DAB517524}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E2C42E77-1925-4E97-A37B-4125F124BDDF} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
{74BEDE45-FBB9-4447-91E9-54A4C9C7EC7F} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
{2E13AD77-F625-4B0A-A355-75421D4ABC6D} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
{5F6267A0-A6C5-4D1E-B7FF-F8F8D09D8588} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
{23FD2074-1B0F-495A-831E-7A0D645CDF88} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
{9FDD9052-506D-460D-BF4A-142DAB517524} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"projects": [ "src", "test" ]
}
21 changes: 21 additions & 0 deletions src/Certes.Cli/Certes.Cli.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>

<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>23fd2074-1b0f-495a-831e-7a0d645cdf88</ProjectGuid>
<RootNamespace>AutoCert.Cli</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
25 changes: 25 additions & 0 deletions src/Certes.Cli/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": "1.0.0-*",
"buildOptions": {
"emitEntryPoint": true,
"warningsAsErrors": true,
"nowarn": [ "CS1591" ],
"xmlDoc": true
},

"dependencies": {
"Certes": "1.0.0-*",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
},
"NLog": "5.0.0-beta03-tryoutMutex",
"System.CommandLine": "0.1.0-e161104-2"
},

"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}
}
19 changes: 19 additions & 0 deletions src/Certes/Certes.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>5f6267a0-a6c5-4d1e-b7ff-f8f8d09d8588</ProjectGuid>
<RootNamespace>Certes</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
42 changes: 42 additions & 0 deletions src/Certes/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "1.0.0-*",
"title": "Certes ACME Client",
"description": "A client implantation for the Automated Certificate Management Environment (ACME) protocol",
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"Portable.BouncyCastle": "1.8.1.2",
"System.Net.Http": "4.3.0",
"System.Runtime.InteropServices": "4.3.0"
},
"frameworks": {
"netstandard1.3": {}
},
"buildOptions": {
"embed": [
"Resources/**/*.*"
],
"warningsAsErrors": true,
"xmlDoc": true
},
"packOptions": {
"projectUrl": "https://github.com/fszlin/certes",
"repository": {
"type": "git",
"url": "https://github.com/fszlin/certes"
},
"summary": "Certes is a client implantation for the Automated Certificate Management Environment (ACME) protocol, build on .NET Core. It is aimed to provide a easy to use API for managing certificates using scripts during build process.",
"owners": [
"Certes Contributors"
],
"licenseUrl": "https://github.com/fszlin/certes/blob/master/LICENSE",
"requireLicenseAcceptance": false,
"tags": [
"Certes",
"letsencrypt",
"ACME",
"HTTPS",
"SSL",
"Certificate"
]
}
}
22 changes: 22 additions & 0 deletions test/Certes.Tests/Certes.Tests.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>9fdd9052-506d-460d-bf4a-142dab517524</ProjectGuid>
<RootNamespace>Certes</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
2 changes: 1 addition & 1 deletion test/Certes.Tests/Cli/CliTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private async Task<IList<string>> RunCommand(string cmd, Dictionary<string, stri

var consoleRule = new LoggingRule("*", LogLevel.Debug, memoryTarget);
config.LoggingRules.Add(consoleRule);

var args = cmd.Split(' ')
.Select(s => placeHolders?.ContainsKey(s) == true ? placeHolders[s] : s)
.ToArray();
Expand Down
26 changes: 26 additions & 0 deletions test/Certes.Tests/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"buildOptions": {
},

"dependencies": {
"Certes": "1.0.0-*",
"Certes.Cli": "1.0.0-*",
"xunit": "2.2.0-beta4-build3444",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
},
"Moq": "4.6.38-alpha",
"System.Diagnostics.TraceSource": "4.3.0",
"Portable.BouncyCastle": "1.8.1.2"
},

"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
}
}
}

0 comments on commit f81abb8

Please sign in to comment.