Skip to content

Commit

Permalink
Merge branch 'release/0.6.0'
Browse files Browse the repository at this point in the history
* release/0.6.0: (72 commits)
  (docs) Added missing documentation
  (build) Updated appveyor file
  (build) Updated unit tests to increase coverage
  (GH-66) Updated cake build file to use coverlet
  (GH-66) Added coverlet package to unit tests library
  (docs) Added documentation for new attribute parameter feature
  (build) Added wyam generated files to ignore list
  (GH-65) Added ability to pass in parameters when localizing html attributes
  Updated gitversion configuration
  Updated yarn dependencies
  Changed cssmin to clean-css
  Started using custom cake.recipe script
  Updated vagrantfile and removed support for ubuntu 14.04
  Migrated gulpfile to gulp v4
  Bump gulp from 3.9.1 to 4.0.0 in /src/Localization.Demo
  Bump Microsoft.NET.Test.Sdk
  Delete config.yml
  Update config.yml
  Delete todo.yml
  Update config.yml
  ...
  • Loading branch information
AdmiringWorm committed Mar 1, 2019
2 parents b10122d + aa9277c commit 0ff69b8
Show file tree
Hide file tree
Showing 53 changed files with 1,803 additions and 1,263 deletions.
81 changes: 81 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"projectName": "Localization.AspNetCore.TagHelpers",
"projectOwner": "WormieCorp",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "AdmiringWorm",
"name": "Kim J. Nordmo",
"avatar_url": "https://avatars3.githubusercontent.com/u/1474648?v=4",
"profile": "https://github.com/AdmiringWorm",
"contributions": [
"maintenance"
]
},
{
"login": "gitter-badger",
"name": "The Gitter Badger",
"avatar_url": "https://avatars2.githubusercontent.com/u/8518239?v=4",
"profile": "https://gitter.im",
"contributions": [
"doc"
]
},
{
"login": "codetriage-readme-bot",
"name": "README Bot",
"avatar_url": "https://avatars0.githubusercontent.com/u/35302948?v=4",
"profile": "https://www.codetriage.com",
"contributions": [
"doc"
]
},
{
"login": "encrypt0r",
"name": "Muhammad Azeez",
"avatar_url": "https://avatars2.githubusercontent.com/u/16880059?v=4",
"profile": "https://encrypt0r.github.io/",
"contributions": [
"ideas",
"code"
]
},
{
"login": "dependabot[bot]",
"name": "dependabot[bot]",
"avatar_url": "https://avatars3.githubusercontent.com/in/2141?v=4",
"profile": "https://github.com/apps/dependabot",
"contributions": [
"code"
]
},
{
"login": "whitesource-bolt-for-github[bot]",
"name": "whitesource-bolt-for-github[bot]",
"avatar_url": "https://avatars2.githubusercontent.com/in/16809?v=4",
"profile": "https://github.com/apps/whitesource-bolt-for-github",
"contributions": [
"security"
]
}
],
"contributorsPerLine": 7,
"types": {
"bug": {
"symbol": "🐛",
"description": "Bug reports",
"link": "<%= options.repoHost %>/<%= options.projectOwner %>/<%= options.projectName %>/issues?q=author%3A<%= contributor.login %>+label%3Abug"
},
"ideas": {
"symbol": "🤔",
"description": "Ideas, Planning, & Feedback",
"link": "<%= options.repoHost %>/<%= options.projectOwner %>/<%= options.projectName %>/issues?q=author%3A<%= contributor.login %>"
}
}
}
24 changes: 16 additions & 8 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,51 @@
image:
- Visual Studio 2017
- Ubuntu
matrix:
fast_finish: true
for:
-
matrix:
only:
- image: Ubuntu
skip_commits:
files:
- docs/*
pull_requests:
do_not_increment_build_number: true
environment:
APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
nodejs_version: "8"
nodejs_version: "10"
branches:
except:
- ci/travis
- ci/wercker
- gh-pages
stack: node 8
- /dependabot\/.*/

install:
- ps: if ($isWindows) { Install-Product node $env:nodejs_version }
- node --version
- npm --version

build_script:
- ps: |
if ($isWindows) {
.\build.ps1 -Configuration Release -Target AppVeyor
} else {
.\build.ps1 -Configuration Release -Target Upload-AppVeyor-Artifacts
.\build.ps1 -Configuration Release -Target AppVeyor-Linux
}
- ps: |
$wc = New-Object 'System.Net.WebClient'
Get-ChildItem -Path "./" -Name "TestResult*.xml" -Recurse -File | % {
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_))
}
artifacts:
- path: artifacts\**\*.zip
- path: artifacts\**\*.nupkg

test: off

cache:
- tools -> build.ps1,setup.cake
- src/Localization.Demo/node_modules -> src/Localization.Demo/package.json
- src/Localization.Demo/wwwroot/lib -> src/Localization.Demo/bower.json,src/Localization.Demo/.bowerrc
- src/Localization.Demo/wwwroot/lib -> src/Localization.Demo/package.json
18 changes: 18 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,21 @@
*.ps1 eol=crlf
*.resx whitespace=-blank-at-eol
*.md whitespace=-trailing-space

# Files that should not be packed inside archives
.github/ export-ignore
docs/ export-ignore
.appveyor.yml export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.mergify.yml export-ignore
.travis.yml export-ignore
CODE_OF_CONDUCT.md export-ignore
CodeMaid.config export-ignore
config.wyam export-ignore
CONTRIBUTING.md export-ignore
GitReleaseManager.yaml export-ignore
GitVersion.yml export-ignore
*.vsext export-ignore
Vagrantfile export-ignore
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug, triage
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1.
2.
3.
4.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. Windows 10]
- Version: [e.g. 0.3.0]
- .NET Core Version: [e.g 2.0.0]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: Feature, triage
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
3 changes: 3 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
sentimentBotToxicityThreshold: .7
sentimentBotReplyComment: >
Please be sure to review the code of conduct and be respectful of other users. cc/ @AdmiringWorm
todo:
keyword: ['@todo','TODO:']
14 changes: 10 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted

*.pubxml
*.publishproj

Expand Down Expand Up @@ -506,8 +505,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted

*.pubxml
*.publishproj

Expand Down Expand Up @@ -634,3 +632,11 @@ tools/**/*

# Build Artifacts
BuildArtifacts/

# Minified files
*.min.css
*.min.js

# Wyam generated files
config.wyam.*
docs/input/tasks/
18 changes: 18 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pull_request_rules:
- name: automatic merge when CI passes and 1 review
conditions:
- "#approved-reviews-by>=1"
- status-success=continuous-integration/appveyor/pr
- status-success=WIP
- status-success=codecov/patch
- status-success=license/cla
- status-success=CodeFactor
- base=develop
actions:
merge:
strict: smart
method: merge
- name: delete head branch after merge
conditions: []
actions:
delete_head_branch: {}
8 changes: 8 additions & 0 deletions GitReleaseManager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@ issue-labels-include:
- Feature
- Bug
- Improvement
- dependencies
- Documentation
issue-labels-exclude:
- Build
- Refactor
issue-labels-alias:
- name: Documentation
header: Documentation
plural: Documentation
- name: dependencies
header: Dependency
plural: Dependencies
5 changes: 3 additions & 2 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ branches:
master:
mode: ContinuousDelivery
tag: ''
dev(elop)?(ment)?$:
develop:
tag: alpha
track-merge-target: true
ignore:
sha: []
sha:
- 8db37d4284185e5f67cffc5882282eed344c80f9
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 Kim Nordmo
Copyright (c) 2016-2019 Kim Nordmo

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 3 additions & 0 deletions Localization.AspNetCore.TagHelpers.sln
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,7 @@ Global
{4EE6892E-D2DC-4A7C-93B6-4DF090F4C3BB} = {E4EFD1F1-4672-4CE1-8634-5B12B6FF6BA3}
{10E38FB3-4EC8-4A59-94D9-70656BA8E0ED} = {2D4CC67C-4BBC-4800-B051-761E3E5386D2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F7CFD0E-AD73-4E8E-9B5B-2A3EA16F13C1}
EndGlobalSection
EndGlobal
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Localization.AspNetCore.TagHelpers
[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors)

[![Join the chat at https://gitter.im/WormieCorp/Localization.AspNetCore.TagHelpers](https://badges.gitter.im/WormieCorp/Localization.AspNetCore.TagHelpers.svg)](https://gitter.im/WormieCorp/Localization.AspNetCore.TagHelpers?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![CLA assistant](https://cla-assistant.io/readme/badge/WormieCorp/Localization.AspNetCore.TagHelpers)](https://cla-assistant.io/WormieCorp/Localization.AspNetCore.TagHelpers)
[![Open Source Helpers](https://www.codetriage.com/wormiecorp/localization.aspnetcore.taghelpers/badges/users.svg)](https://www.codetriage.com/wormiecorp/localization.aspnetcore.taghelpers)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=WormieCorp/Localization.AspNetCore.TagHelpers)](https://dependabot.com)

| AppVeyor | NuGet | GitHub | Codecov |
| :------: | :---: | :----: | :-----: |
Expand All @@ -27,3 +28,14 @@ Ability to localize html attribute using the following: `<span localize-title="I

You can read more about this on the [Documentation](https://wormiecorp.github.io/Localization.AspNetCore.TagHelpers/docs/helpers) page.
Please also see the Localization.Demo project for a working template with the use of these localization helpers (based on default asp.net core template)

## Contributors

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
<table><tr><td align="center"><a href="https://github.com/AdmiringWorm"><img src="https://avatars3.githubusercontent.com/u/1474648?v=4" width="100px;" alt="Kim J. Nordmo"/><br /><sub><b>Kim J. Nordmo</b></sub></a><br /><a href="#maintenance-AdmiringWorm" title="Maintenance">🚧</a></td><td align="center"><a href="https://gitter.im"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4" width="100px;" alt="The Gitter Badger"/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/WormieCorp/Localization.AspNetCore.TagHelpers/commits?author=gitter-badger" title="Documentation">📖</a></td><td align="center"><a href="https://www.codetriage.com"><img src="https://avatars0.githubusercontent.com/u/35302948?v=4" width="100px;" alt="README Bot"/><br /><sub><b>README Bot</b></sub></a><br /><a href="https://github.com/WormieCorp/Localization.AspNetCore.TagHelpers/commits?author=codetriage-readme-bot" title="Documentation">📖</a></td><td align="center"><a href="https://encrypt0r.github.io/"><img src="https://avatars2.githubusercontent.com/u/16880059?v=4" width="100px;" alt="Muhammad Azeez"/><br /><sub><b>Muhammad Azeez</b></sub></a><br /><a href="https://github.com/WormieCorp/Localization.AspNetCore.TagHelpers/issues?q=author%3Aencrypt0r" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/WormieCorp/Localization.AspNetCore.TagHelpers/commits?author=encrypt0r" title="Code">💻</a></td><td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars3.githubusercontent.com/in/2141?v=4" width="100px;" alt="dependabot[bot]"/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/WormieCorp/Localization.AspNetCore.TagHelpers/commits?author=dependabot[bot]" title="Code">💻</a></td><td align="center"><a href="https://github.com/apps/whitesource-bolt-for-github"><img src="https://avatars2.githubusercontent.com/in/16809?v=4" width="100px;" alt="whitesource-bolt-for-github[bot]"/><br /><sub><b>whitesource-bolt-for-github[bot]</b></sub></a><br /><a href="#security-whitesource-bolt-for-github[bot]" title="Security">🛡️</a></td></tr></table>
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
9 changes: 6 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# vi: set ft=ruby :

$ubuntuScript = <<-SCRIPT
sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ $(lsb_release -c -s) main" > /etc/apt/sources.list.d/dotnetdev.list'
sh -c 'echo "deb http://download.mono-project.com/repo/debian wheezy main" > /etc/apt/sources.list.d/mono.list'
wget -q https://packages.microsoft.com/config/ubuntu/$(lsb_release -r -s)/packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb
sh -c 'echo "debug https://download.mono-project.com/repo/ubuntu stable-$(lsb_release -c -s) main" | > etc/apt/sources.list.d/mono.list'
apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
apt-get install apt-transport-https --no-install-recommends
apt-get update
apt-get install dotnet-dev-1.0.1 mono-devel nuget npm ca-certificates-mono -y --no-install-recommends
apt-get install dotnet-sdk-2.2 mono-devel nuget npm ca-certificates-mono -y --no-install-recommends
if [ -d "/home/vagrant" ]; then
USER=vagrant
elif [ -d "/home/ubuntu" ]; then
Expand All @@ -19,6 +21,7 @@ $ubuntuScript = <<-SCRIPT
exit 0
SCRIPT
Vagrant.configure("2") do |config|

config.vm.define :trusty, autostart: false do |trusty|
trusty.vm.box = "ubuntu/trusty64"
trusty.vm.provision :shell, inline: $ubuntuScript
Expand Down
Loading

0 comments on commit 0ff69b8

Please sign in to comment.