Merge branch 'release/v0.4.6'

Stoom · Apr 3, 2017 · 9ef6e7f · 9ef6e7f
2 parents 6021395 + bcb0a9a
commit 9ef6e7f
Show file tree

Hide file tree

Showing 51 changed files with 4,294 additions and 440 deletions.
diff --git a/RService.IO.sln b/RService.IO.sln
@@ -1,32 +1,47 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B748CB97-7861-4FC7-828D-11C44E540630}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{64F366F9-AA78-455D-B3C7-94B9F14814AA}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
-		global.json = global.json
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1F1CF499-A7DD-4BEE-B9B5-E5A87E0ADDA4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RService.IO.Tests", "test\RService.IO.Tests\RService.IO.Tests.xproj", "{29E250BF-7D21-4B2D-81DD-F527C0CC3286}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RService.IO.Tests", "test\RService.IO.Tests\RService.IO.Tests.csproj", "{29E250BF-7D21-4B2D-81DD-F527C0CC3286}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RService.IO", "src\RService.IO\RService.IO.xproj", "{80003DA0-A02B-487A-8E22-973B5A4BF0CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RService.IO", "src\RService.IO\RService.IO.csproj", "{80003DA0-A02B-487A-8E22-973B5A4BF0CD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Rservice.IO.Tests.Integration", "test\Rservice.IO.Tests.Integration\Rservice.IO.Tests.Integration.xproj", "{CE9393A2-ED69-4748-913B-3C11143957F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rservice.IO.Tests.Integration", "test\Rservice.IO.Tests.Integration\Rservice.IO.Tests.Integration.csproj", "{CE9393A2-ED69-4748-913B-3C11143957F5}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RService.IO.Abstractions", "src\RService.IO.Abstractions\RService.IO.Abstractions.xproj", "{4474DEEE-06F5-4706-97A2-A437E258F485}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RService.IO.Abstractions", "src\RService.IO.Abstractions\RService.IO.Abstractions.csproj", "{4474DEEE-06F5-4706-97A2-A437E258F485}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RService.IO.Authorization", "src\RService.IO.Authorization\RService.IO.Authorization.xproj", "{4FA0A7F5-B8AC-4BE0-BD20-7E2CDB16AE8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RService.IO.Authorization", "src\RService.IO.Authorization\RService.IO.Authorization.csproj", "{4FA0A7F5-B8AC-4BE0-BD20-7E2CDB16AE8B}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RService.IO.Authorization.Tests", "test\RService.IO.Authorization.Tests\RService.IO.Authorization.Tests.xproj", "{44B66719-E3DC-4F39-A67D-196BCB9A0FA7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RService.IO.Authorization.Tests", "test\RService.IO.Authorization.Tests\RService.IO.Authorization.Tests.csproj", "{44B66719-E3DC-4F39-A67D-196BCB9A0FA7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8183F92D-35F0-4362-896B-9BEEFE2EC1D0}"
+	ProjectSection(SolutionItems) = preProject
+		build\common.props = build\common.props
+		build\dependencies.props = build\dependencies.props
+		build\version.props = build\version.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9BBD4CCC-ECA9-49A3-BDC6-EBECAE6C562A}"
+	ProjectSection(SolutionItems) = preProject
+		samples\README.md = samples\README.md
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiSample", "samples\WebApiSample\WebApiSample.csproj", "{0630EC05-F984-4683-A974-F3B67F20EF51}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RServiceSample", "samples\RServiceSample\RServiceSample.csproj", "{69CE6A1F-1815-4D5F-8844-F401A318C9B5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -58,6 +73,14 @@ Global
 		{44B66719-E3DC-4F39-A67D-196BCB9A0FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44B66719-E3DC-4F39-A67D-196BCB9A0FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44B66719-E3DC-4F39-A67D-196BCB9A0FA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0630EC05-F984-4683-A974-F3B67F20EF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0630EC05-F984-4683-A974-F3B67F20EF51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0630EC05-F984-4683-A974-F3B67F20EF51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0630EC05-F984-4683-A974-F3B67F20EF51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69CE6A1F-1815-4D5F-8844-F401A318C9B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69CE6A1F-1815-4D5F-8844-F401A318C9B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69CE6A1F-1815-4D5F-8844-F401A318C9B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69CE6A1F-1815-4D5F-8844-F401A318C9B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -69,5 +92,7 @@ Global
 		{4474DEEE-06F5-4706-97A2-A437E258F485} = {B748CB97-7861-4FC7-828D-11C44E540630}
 		{4FA0A7F5-B8AC-4BE0-BD20-7E2CDB16AE8B} = {B748CB97-7861-4FC7-828D-11C44E540630}
 		{44B66719-E3DC-4F39-A67D-196BCB9A0FA7} = {1F1CF499-A7DD-4BEE-B9B5-E5A87E0ADDA4}
+		{0630EC05-F984-4683-A974-F3B67F20EF51} = {9BBD4CCC-ECA9-49A3-BDC6-EBECAE6C562A}
+		{69CE6A1F-1815-4D5F-8844-F401A318C9B5} = {9BBD4CCC-ECA9-49A3-BDC6-EBECAE6C562A}
 	EndGlobalSection
 EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '0.1.1-{build}'
+version: '1.0.0-{build}'
 configuration:
 - Release
 platform: Any CPU
@@ -12,23 +12,35 @@ environment:
 pull_requests:
   do_not_increment_build_number: true
 init:
-- ps: $Env:LABEL = $Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
+- ps: $Env:LABEL = "pre-${Env:APPVEYOR_BUILD_NUMBER}"
 before_build:
 - appveyor-retry dotnet restore -v Minimal
 build_script:
-- dotnet build "src\RService.IO" -c %CONFIGURATION% --version-suffix %LABEL%
-- dotnet build "src\RService.IO.Abstractions" -c %CONFIGURATION% --version-suffix %LABEL%
-- dotnet build "src\RService.IO.Authorization" -c %CONFIGURATION% --version-suffix %LABEL%
+- dotnet build "src\RService.IO" -c %CONFIGURATION%
+- dotnet build "src\RService.IO.Abstractions" -c %CONFIGURATION%
+- dotnet build "src\RService.IO.Authorization" -c %CONFIGURATION%
 test_script:
-  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Tests" -register:user -filter:"+[RService.IO*]* -[RService.IO.Tests*]*" -output:coverage.xml -oldStyle'
-  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Authorization.Tests" -register:user -filter:"+[RService.IO*]* -[RService.IO.Authorization.Tests*]*" -mergeoutput -output:coverage.xml -oldStyle'
-  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Tests.Integration" -register:user -filter:"+[RService.IO*]* -[RService.IO.Tests*]*" -mergeoutput -output:coverage.xml -oldStyle'
+  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Tests\RService.IO.Tests.csproj" -register:user -filter:"+[RService.IO*]* -[RService.IO.Tests*]*" -output:coverage.xml -oldStyle'
+  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Authorization.Tests\RService.IO.Authorization.Tests.csproj" -register:user -filter:"+[RService.IO*]* -[RService.IO.Authorization.Tests*]*" -mergeoutput -output:coverage.xml -oldStyle'
+  - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe "-target:C:\Program Files\dotnet\dotnet.exe" -targetargs:"test .\test\RService.IO.Tests.Integration\RService.IO.Tests.Integration.csproj" -register:user -filter:"+[RService.IO*]* -[RService.IO.Tests*]*" -mergeoutput -output:coverage.xml -oldStyle'
   - ps: '& ${env:homedrive}${env:homepath}\.nuget\packages\coveralls.io\1.3.4\tools\coveralls.net.exe --opencover coverage.xml'
   - ps: pip install codecov;  codecov -f coverage.xml -X gcov
 after_test:
-  - ps: dotnet pack "src\RService.IO" -c ${env:CONFIGUREATION} --no-build --version-suffix ${env:LABEL} -o artifacts
-  - ps: dotnet pack "src\RService.IO.Abstractions" -c ${env:CONFIGUREATION} --no-build --version-suffix ${env:LABEL} -o artifacts
-  - ps: dotnet pack "src\RService.IO.Authorization" -c ${env:CONFIGUREATION} --no-build --version-suffix ${env:LABEL} -o artifacts
+  - ps: |
+      if ($env:APPVEYOR_REPO_BRANCH -eq "master")
+      {
+        echo "building master release"
+        dotnet pack .\src\RService.IO.Abstractions\RService.IO.Abstractions.csproj -c ${env:CONFIGURATION} -o artifacts
+        dotnet pack .\src\RService.IO\RService.IO.csproj -c ${env:CONFIGURATION} -o artifacts
+        dotnet pack .\src\RService.IO.Authorization\RService.IO.Authorization.csproj -c ${env:CONFIGURATION} -o artifacts
+      }
+      else
+      {
+        echo "build ${env:LABEL}"
+        dotnet pack .\src\RService.IO.Abstractions\RService.IO.Abstractions.csproj -c ${env:CONFIGURATION} -o artifacts --version-suffix "pre-${env:APPVEYOR_BUILD_NUMBER}"
+        dotnet pack .\src\RService.IO\RService.IO.csproj -c ${env:CONFIGURATION} -o artifacts --version-suffix "pre-${env:APPVEYOR_BUILD_NUMBER}"
+        dotnet pack .\src\RService.IO.Authorization\RService.IO.Authorization.csproj -c ${env:CONFIGURATION} -o artifacts --version-suffix "pre-${env:APPVEYOR_BUILD_NUMBER}"
+      }
 artifacts:
   - path: '**/RService.IO.*.nupkg'
     name: NuGet Package

diff --git a/build/common.props b/build/common.props
@@ -0,0 +1,22 @@
+<Project>
+  <Import Project="dependencies.props" />
+  <Import Project="version.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageTags>microservice;webservice;dotnet core;api;RESTful;RService.IO</PackageTags>
+    <PackageReleaseNotes>Initial alpha release</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/Stoom/RService.IO/master/logos/RServiceIO%20Logo.png</PackageIconUrl>
+    <PackageProjectUrl>https://rservice.io</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/Stoom/RService.IO/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Stoom/RService.IO</RepositoryUrl>
+  </PropertyGroup>
+</Project>
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/build/version.props b/build/version.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>0.4.6</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+</Project>