diff --git a/.travis.yml b/.travis.yml
index 3f06e121..8f808757 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: csharp
mono: none
-dotnet: 1.0.0
+dotnet: 1.0.0-preview2-003131
sudo: required
dist: trusty
os:
@@ -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
diff --git a/Certes.sln b/Certes.sln
index 4191d2df..4126f34f 100644
--- a/Certes.sln
+++ b/Certes.sln
@@ -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
@@ -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
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..04970a15
--- /dev/null
+++ b/global.json
@@ -0,0 +1,3 @@
+{
+ "projects": [ "src", "test" ]
+}
\ No newline at end of file
diff --git a/src/Certes.Cli/Certes.Cli.xproj b/src/Certes.Cli/Certes.Cli.xproj
new file mode 100644
index 00000000..6bfc98d8
--- /dev/null
+++ b/src/Certes.Cli/Certes.Cli.xproj
@@ -0,0 +1,21 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+
+ 23fd2074-1b0f-495a-831e-7a0d645cdf88
+ AutoCert.Cli
+ .\obj
+ .\bin\
+ v4.5
+
+
+
+ 2.0
+
+
+
diff --git a/src/Certes.Cli/project.json b/src/Certes.Cli/project.json
new file mode 100644
index 00000000..87dcb1a3
--- /dev/null
+++ b/src/Certes.Cli/project.json
@@ -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"
+ }
+ }
+}
diff --git a/src/Certes/Certes.xproj b/src/Certes/Certes.xproj
new file mode 100644
index 00000000..d5b43024
--- /dev/null
+++ b/src/Certes/Certes.xproj
@@ -0,0 +1,19 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 5f6267a0-a6c5-4d1e-b7ff-f8f8d09d8588
+ Certes
+ .\obj
+ .\bin\
+ v4.6.1
+
+
+ 2.0
+
+
+
\ No newline at end of file
diff --git a/src/Certes/project.json b/src/Certes/project.json
new file mode 100644
index 00000000..cd252e16
--- /dev/null
+++ b/src/Certes/project.json
@@ -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"
+ ]
+ }
+}
diff --git a/test/Certes.Tests/Certes.Tests.xproj b/test/Certes.Tests/Certes.Tests.xproj
new file mode 100644
index 00000000..9dd9d0aa
--- /dev/null
+++ b/test/Certes.Tests/Certes.Tests.xproj
@@ -0,0 +1,22 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 9fdd9052-506d-460d-bf4a-142dab517524
+ Certes
+ .\obj
+ .\bin\
+ v4.5
+
+
+ 2.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/Certes.Tests/Cli/CliTests.cs b/test/Certes.Tests/Cli/CliTests.cs
index f5ebb47e..79b95304 100644
--- a/test/Certes.Tests/Cli/CliTests.cs
+++ b/test/Certes.Tests/Cli/CliTests.cs
@@ -100,7 +100,7 @@ private async Task> RunCommand(string cmd, Dictionary placeHolders?.ContainsKey(s) == true ? placeHolders[s] : s)
.ToArray();
diff --git a/test/Certes.Tests/project.json b/test/Certes.Tests/project.json
new file mode 100644
index 00000000..97950df3
--- /dev/null
+++ b/test/Certes.Tests/project.json
@@ -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"
+ }
+ }
+}