From 87b625902b86e9072a596ff309f810630d96388c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Wed, 6 Dec 2017 23:08:09 +0000 Subject: [PATCH] Update project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add new project guids - Update AppVeyor - Add GitVersion for CI - Update version info to 1.0.0.0 - Add AssemblyInformationalVersion attribute - Update dependencies - Add dependencies to Nuget deliverables Signed-off-by: José Simões --- GitVersion.yml | 28 ++ appveyor.yml | 332 ++++++++++++++++-- source/AssemblyInfo.cs | 5 +- ...et.Windows.Devices.Spi.DELIVERABLES.nuproj | 7 +- .../Nuget.Windows.Devices.Spi.nuproj | 4 +- source/Windows.Devices.Spi.nfproj | 14 +- source/nanoFramework.Windows.Devices.Spi.sln | 7 +- source/packages.config | 2 +- 8 files changed, 351 insertions(+), 48 deletions(-) create mode 100644 GitVersion.yml diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..00dcb15 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,28 @@ +next-version: 1.0.0 +assembly-versioning-scheme: MajorMinorPatch +build-metadata-padding: 3 +legacy-semver-padding: 3 +assembly-informational-format: '{LegacySemVerPadded}' +major-version-bump-message: '\+semver:\s?(breaking|major)' +minor-version-bump-message: '\+semver:\s?(feature|minor)' +patch-version-bump-message: '\+semver:\s?(fix|patch)' +commit-message-incrementing: MergeMessageOnly +branches: + master: + mode: ContinuousDelivery + tag: + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + develop: + mode: ContinuousDeployment + tag: preview + increment: Minor + prevent-increment-of-merged-branch-version: false + track-merge-target: true + release: + tag: rc + (pull|pull\-requests|pr)[/-]: + tag: alpha +ignore: + sha: [] diff --git a/appveyor.yml b/appveyor.yml index 9d1d37d..b14128f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,30 +1,302 @@ -version: 1.0.{build} -pull_requests: - do_not_increment_build_number: true -image: Visual Studio 2017 -clone_depth: 1 -install: -- ps: .\install-vsix-appveyor.ps1 -build_script: -- ps: >- - - nuget restore source\nanoFramework.Windows.Devices.Spi.sln - - msbuild source\nanoFramework.Windows.Devices.Spi.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - -artifacts: -- path: '**\bin\Release\*.nupkg' - name: Nuget Packages -deploy: -- provider: NuGet - api_key: - secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY - skip_symbols: true -notifications: -- provider: Slack - auth_token: - secure: 2tqAJTTbN2dm24Vrwo5TXun3Vxc34R5G9l7o3pK3xEuKZAzxx3nbP2yGkMI/kl3+NxHXknjBfZnkhZC5eLYBHb+jO7YVUZwPYOfC/ZGy5HU= - channel: '#build-monitor' - on_build_status_changed: true - on_build_success: false - on_build_failure: false +# configuration for "master" branch +- + branches: + only: + - master + + image: Visual Studio 2017 + + skip_branch_with_pr: true + + # Skipping commits affecting specific files + skip_commits: + files: + - '**\AssemblyInfo.*' + - '**/*.md' + - 'LICENSE' + - dir/* + - '.gitignore' + + build: + verbosity: minimal + + test: off + + environment: + APPVEYOR_SAVE_CACHE_ON_ERROR: true + matrix: + - RUBY_VERSION: 24 + GitHubUserName: + secure: 7OBtVAMTodMWK20wg6pGnQ== + GitHubUserEmail: + secure: HeABB68Sn/Lhbd69C2cUcfWv0ab/rMDEcOLvcxf8gGw= + GitHubToken: + secure: WOqlCsnwTzfDPJFoNV/h8mEESIpG/9uFn1u6oE8hGZtXwIQQlsY+NyyLt9Y5xoFn + + init: + - git config --global core.autocrlf true + - git config --global credential.helper store + - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):x-oauth-basic@github.com`n" + - git config --global user.email "%GitHubUserEmail%" + - git config --global user.name "%GitHubUserName%" + + install: + - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% + - gem install github_changelog_generator --quiet --no-ri --no-rdoc + # - bundle install + - choco install gitversion.portable -pre -y + - ps: .\install-vsix-appveyor.ps1 + + before_build: + - ps: >- + + nuget restore source\nanoFramework.Windows.Devices.Spi.sln + + gitversion /l console /output buildserver /updateAssemblyInfo /ensureassemblyinfo + + build_script: + - ps: >- + + msbuild source\nanoFramework.Windows.Devices.Spi.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + + before_deploy: + # need this to keep ruby happy + - ps: md c:\tmp + - bundle exec github_changelog_generator --token %GitHubToken% + # add here the updated changelog and the updated assembly info files + - git add . + - git commit --amend --no-edit + + artifacts: + - path: '**\bin\Release\*.nupkg' + name: Nuget_Packages + + deploy: + - provider: NuGet + api_key: + secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY + skip_symbols: true + on: + appveyor_repo_tag: true + - provider: GitHub + tag: v$(GitVersion_NuGetVersionV2) + release: nanoFramework Core Library v$(gitversion_semver) + description: '[CHANGELOG.md](https://github.com/nanoframework/lib-nanoFramework.Windows.Devices.Spi/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Windows.Devices.Spi/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' + auth_token: + secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S + artifact: Nuget_Packages + draft: true + prerelease: true + force_update: true + + notifications: + - provider: Slack + auth_token: + secure: 2tqAJTTbN2dm24Vrwo5TXun3Vxc34R5G9l7o3pK3xEuKZAzxx3nbP2yGkMI/kl3+NxHXknjBfZnkhZC5eLYBHb+jO7YVUZwPYOfC/ZGy5HU= + channel: '#build-monitor' + on_build_status_changed: true + on_build_success: false + on_build_failure: false + + cache: + - source\packages -> **source\packages.config + - C:\ProgramData\chocolatey\bin -> appveyor.yml + - C:\ProgramData\chocolatey\lib -> appveyor.yml + + +#################################### +# configuration for develop branches +- + branches: + only: + - /dev.*/ + + image: Visual Studio 2017 + + skip_branch_with_pr: true + + # Do not build on tags + skip_tags: false + + test: off + + pull_requests: + do_not_increment_build_number: true + + # Skipping commits affecting specific files + skip_commits: + files: + - '**\AssemblyInfo.*' + - '**/*.md' + - 'LICENSE' + - dir/* + - '.gitignore' + + build: + verbosity: minimal + + install: + - choco install gitversion.portable -pre -y + - ps: .\install-vsix-appveyor.ps1 + + before_build: + - ps: >- + + nuget restore source\nanoFramework.Windows.Devices.Spi.sln + + gitversion /l console /output buildserver /updateAssemblyInfo /ensureassemblyinfo + + build_script: + - ps: >- + + msbuild source\nanoFramework.Windows.Devices.Spi.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + + on_success: + # for this environment variable to work here it has to be set in AppVeyor UI + - nuget push source\Nuget.Windows.Devices.Spi\bin\Release\nanoFramework.Windows.Devices.Spi.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package + - nuget push source\Nuget.Windows.Devices.Spi.DELIVERABLES\bin\Release\nanoFramework.Windows.Devices.Spi.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package + + artifacts: + - path: '**\bin\Release\*.nupkg' + name: Nuget_Packages + + deploy: + # the provider is actually MyGet but works the same as NuGet + - provider: NuGet + server: https://www.myget.org/F/nanoframework-dev/api/v2/package + api_key: + secure: 0drE56FivPFYI3oVZWcVFTpjOXSqyjT6kGangIxFRcRLqMhV3lQHqUButuuiPM+N + skip_symbols: true + - provider: GitHub + tag: v$(GitVersion_NuGetVersionV2) + release: nanoFramework Core Library v$(gitversion_semver) + description: '[CHANGELOG.md](https://github.com/nanoframework/lib-Windows.Devices.Spi/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Windows.Devices.Spi/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' + auth_token: + secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S + artifact: Nuget_Packages + draft: true + prerelease: true + force_update: true + + notifications: + - provider: Slack + auth_token: + secure: 2tqAJTTbN2dm24Vrwo5TXun3Vxc34R5G9l7o3pK3xEuKZAzxx3nbP2yGkMI/kl3+NxHXknjBfZnkhZC5eLYBHb+jO7YVUZwPYOfC/ZGy5HU= + channel: '#build-monitor' + on_build_status_changed: true + on_build_success: false + on_build_failure: false + + cache: + - source\packages -> **source\packages.config + - C:\ProgramData\chocolatey\bin -> appveyor.yml + - C:\ProgramData\chocolatey\lib -> appveyor.yml + +############################################ +# configuration for release candidate branch +- + branches: + only: + - release.* + + image: Visual Studio 2017 + + skip_branch_with_pr: true + + # OK to get only last commit as we don't need history + clone_depth: 1 + + # Skipping commits affecting specific files + skip_commits: + files: + - '**\AssemblyInfo.*' + - '**/*.md' + - 'LICENSE' + - dir/* + - '.gitignore' + + build: + verbosity: minimal + + test: off + + environment: + matrix: + - RUBY_VERSION: 24 + GitHubUserName: + secure: 7OBtVAMTodMWK20wg6pGnQ== + GitHubUserEmail: + secure: HeABB68Sn/Lhbd69C2cUcfWv0ab/rMDEcOLvcxf8gGw= + GitHubToken: + secure: WOqlCsnwTzfDPJFoNV/h8mEESIpG/9uFn1u6oE8hGZtXwIQQlsY+NyyLt9Y5xoFn + + init: + - git config --global core.autocrlf true + - git config --global credential.helper store + - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):x-oauth-basic@github.com`n" + - git config --global user.email "%GitHubUserEmail%" + - git config --global user.name "%GitHubUserName%" + + install: + - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% + - bundle config --local path vendor/bundle + - gem install bundler --quiet --no-ri --no-rdoc + - gem install github_changelog_generator --quiet --no-ri --no-rdoc + # - bundle install + - choco install gitversion.portable -pre -y + - ps: .\install-vsix-appveyor.ps1 + + before_build: + - ps: >- + + nuget restore source\nanoFramework.Windows.Devices.Spi.sln + + gitversion /l console /output buildserver /updateAssemblyInfo /ensureassemblyinfo + + build_script: + - ps: >- + + msbuild source\nanoFramework.Windows.Devices.Spi.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + + before_deploy: + # need this to keep ruby happy + - ps: md c:\tmp + - bundle exec github_changelog_generator --token %GitHubToken% + # add here the updated changelog and the updated assembly info files + - git add . + - git commit --amend --no-edit + + artifacts: + - path: '**\bin\Release\*.nupkg' + name: Nuget_Packages + + deploy: + - provider: NuGet + api_key: + secure: NSRDXbS8tmzOy4wStGuO3yQMKI8Sk10vF8iQtz9ZDXEnHfwnuDdnXbr/Kno3MMvY + skip_symbols: true + + - provider: GitHub + tag: v$(GitVersion_NuGetVersionV2) + release: nanoFramework Core Library v$(gitversion_semver) + description: '[CHANGELOG.md](https://github.com/nanoframework/lib-Windows.Devices.Spi/blob/master/CHANGELOG.md)\n\n## Install from NuGet\n\nThe following NuGet packages are available for download from this release\n\n:package: [.NET](https://www.nuget.org/packages/nanoFramework.Windows.Devices.Spi/$(GitVersion_NuGetVersionV2)) v$(GitVersion_NuGetVersionV2)' + auth_token: + secure: DNixoFFE+pGlwyhj7McfZoln42vOmj0iY1iNV9zXEr3y0NpXlOIgL8k5ehzlFM1S + artifact: Nuget_Packages + draft: true + prerelease: true + force_update: true + + notifications: + - provider: Slack + auth_token: + secure: 2tqAJTTbN2dm24Vrwo5TXun3Vxc34R5G9l7o3pK3xEuKZAzxx3nbP2yGkMI/kl3+NxHXknjBfZnkhZC5eLYBHb+jO7YVUZwPYOfC/ZGy5HU= + channel: '#build-monitor' + on_build_status_changed: true + on_build_success: false + on_build_failure: false + + cache: + - source\packages -> **source\packages.config + - C:\ProgramData\chocolatey\bin -> appveyor.yml + - C:\ProgramData\chocolatey\lib -> appveyor.yml diff --git a/source/AssemblyInfo.cs b/source/AssemblyInfo.cs index f6f8dd5..b3aa196 100644 --- a/source/AssemblyInfo.cs +++ b/source/AssemblyInfo.cs @@ -15,5 +15,6 @@ // Build Number // Revision // -[assembly: AssemblyVersion("1.0.0.19")] -[assembly: AssemblyFileVersion("1.0.0.19")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/source/Nuget.Windows.Devices.Spi.DELIVERABLES/Nuget.Windows.Devices.Spi.DELIVERABLES.nuproj b/source/Nuget.Windows.Devices.Spi.DELIVERABLES/Nuget.Windows.Devices.Spi.DELIVERABLES.nuproj index bf7c25c..7d71f91 100644 --- a/source/Nuget.Windows.Devices.Spi.DELIVERABLES/Nuget.Windows.Devices.Spi.DELIVERABLES.nuproj +++ b/source/Nuget.Windows.Devices.Spi.DELIVERABLES/Nuget.Windows.Devices.Spi.DELIVERABLES.nuproj @@ -33,6 +33,11 @@ content\disasm\%(RecursiveDir)%(Filename)%(Extension) + + + [1.0.0-preview038] + + F117EC96-3B2D-4F2F-8683-BF72CA910624 @@ -42,7 +47,7 @@ nanoFramework.Windows.Devices.Spi.DELIVERABLES - 1.0.0-preview019 + $(GitVersion_NuGetVersionV2) nanoFramework.Windows.Devices.Spi.DELIVERABLES nanoFramework project contributors nanoFramework project contributors diff --git a/source/Nuget.Windows.Devices.Spi/Nuget.Windows.Devices.Spi.nuproj b/source/Nuget.Windows.Devices.Spi/Nuget.Windows.Devices.Spi.nuproj index 8990440..72d2912 100644 --- a/source/Nuget.Windows.Devices.Spi/Nuget.Windows.Devices.Spi.nuproj +++ b/source/Nuget.Windows.Devices.Spi/Nuget.Windows.Devices.Spi.nuproj @@ -32,7 +32,7 @@ - [1.0.0-preview028] + [1.0.0-preview038] @@ -44,7 +44,7 @@ nanoFramework.Windows.Devices.Spi - 1.0.0-preview019 + $(GitVersion_NuGetVersionV2) nanoFramework.Windows.Devices.Spi nanoFramework project contributors nanoFramework project contributors diff --git a/source/Windows.Devices.Spi.nfproj b/source/Windows.Devices.Spi.nfproj index 9653acc..d74a686 100644 --- a/source/Windows.Devices.Spi.nfproj +++ b/source/Windows.Devices.Spi.nfproj @@ -8,13 +8,14 @@ Debug AnyCPU + {11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {A1042594-0DF3-427A-99E1-F77F862EC2F2} Library 512 Windows.Devices.Spi - v1.0 + v1.0 True bin\$(Configuration)\Windows.Devices.Spi.xml @@ -44,7 +45,7 @@ false - + false @@ -65,13 +66,8 @@ - - packages\nanoFramework.CoreLibrary.1.0.0-preview028\lib\mscorlib.dll - True - True - - - packages\nanoFramework.CoreLibrary.1.0.0-preview028\lib\mscorlib.dll + + packages\nanoFramework.CoreLibrary.1.0.0-preview038\lib\mscorlib.dll True True diff --git a/source/nanoFramework.Windows.Devices.Spi.sln b/source/nanoFramework.Windows.Devices.Spi.sln index 36884d3..bd684c0 100644 --- a/source/nanoFramework.Windows.Devices.Spi.sln +++ b/source/nanoFramework.Windows.Devices.Spi.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.14 +VisualStudioVersion = 15.0.27004.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Windows.Devices.Spi", "Windows.Devices.Spi.nfproj", "{A1042594-0DF3-427A-99E1-F77F862EC2F2}" EndProject @@ -31,15 +31,16 @@ Global {A1042594-0DF3-427A-99E1-F77F862EC2F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1042594-0DF3-427A-99E1-F77F862EC2F2}.Release|Any CPU.Build.0 = Release|Any CPU {298761A4-D2D4-4C23-B280-89034582C925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {298761A4-D2D4-4C23-B280-89034582C925}.Debug|Any CPU.Build.0 = Debug|Any CPU {298761A4-D2D4-4C23-B280-89034582C925}.Release|Any CPU.ActiveCfg = Release|Any CPU {298761A4-D2D4-4C23-B280-89034582C925}.Release|Any CPU.Build.0 = Release|Any CPU {F117EC96-3B2D-4F2F-8683-BF72CA910624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F117EC96-3B2D-4F2F-8683-BF72CA910624}.Debug|Any CPU.Build.0 = Debug|Any CPU {F117EC96-3B2D-4F2F-8683-BF72CA910624}.Release|Any CPU.ActiveCfg = Release|Any CPU {F117EC96-3B2D-4F2F-8683-BF72CA910624}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DD82D7FF-B798-48A4-8506-2FBA0001D32F} + EndGlobalSection EndGlobal diff --git a/source/packages.config b/source/packages.config index b627caf..5059e8f 100644 --- a/source/packages.config +++ b/source/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file