Skip to content

Commit b1255bb

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/2.0.0-beta.1' into production
2 parents 5c672d6 + 159ac94 commit b1255bb

File tree

4,636 files changed

+343555
-58901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,636 files changed

+343555
-58901
lines changed

‎.SonarQube.Analysis.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<SonarQubeAnalysisProperties xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
4+
xmlns="http://www.sonarsource.com/msbuild/integration/2015/1">
5+
<Property Name="sonar.coverage.exclusions">
6+
**/*Exception.cs,
7+
**/*.Designer.cs
8+
</Property>
9+
<Property Name="sonar.exclusions">
10+
Examples/**/*
11+
</Property>
12+
</SonarQubeAnalysisProperties>

‎.appveyor.yml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1-
version: '{branch}-{build}'
2-
init:
3-
- cmd: git config --global core.autocrlf true
4-
before_build:
5-
- cmd: nuget restore
6-
build:
7-
verbosity: minimal
1+
image: Visual Studio 2019
2+
version: '{branch}-{build}'
3+
4+
environment:
5+
JAVA_HOME: "C:\\Program Files\\Java\\jdk13"
6+
7+
init:
8+
- cmd: git config --global core.autocrlf true
9+
10+
# https://github.com/SonarSource/sonar-scanner-msbuild/issues/915 means that SonarScanner v5.0.0 breaks the build.
11+
# Forcing it to use previous version 4.10.0 works around it.
12+
install:
13+
- cmd: git submodule update --init --recursive
14+
- cmd: dotnet tool install --global dotnet-sonarscanner --version 4.10.0
15+
16+
build_script:
17+
- cmd: Tools\appveyor-build.cmd
18+
- cmd: Tools\appveyor-create-packages.cmd
19+
- ps: Tools\appveyor-publish-docs-site.ps1
20+
21+
test_script:
22+
- cmd: echo "Tests already run"

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Actual behavior**
24+
A clear and concise description of what actually happens (instead of the expected behaviour).
25+
26+
**Your source files**
27+
Attaching your template source file(s), the actual rendering output & info about any relevant model values would be very helpful for diagnosing rendering issues.
28+
29+
**How are you using ZptSharp?**
30+
* As an API?
31+
* As a ViewEngine (which framework?)
32+
* Command-line app?
33+
34+
**Additional context**
35+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.gitignore‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
bin/
22
obj/
3-
logs/
4-
Deployment/Output/
5-
TestResult.xml
6-
TestResult.formatted.xml
7-
packages/*/
8-
*.VisualState.xml
9-
*.userprefs
10-
*.csproj.user
3+
.TestResults/
114
*.orig
125
*.directory
13-
DEBIAN/
146
*.nupkg
15-
*.nuspec
167
.vs/
17-
18-
# Archives of binaries
19-
CSF.Zpt-api-only.zip
20-
CSF.Zpt-complete.zip
21-
CSF.Zpt.MVC.zip
22-
ZptBuilder.zip
8+
packages/
9+
mono_crash.*.json
10+
.docfx/

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: csharp
2-
solution: CSF.Zpt.sln
2+
solution: ZptSharp.sln
33

4-
install:
5-
- nuget restore CSF.Zpt.sln
6-
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
4+
jobs:
5+
include:
6+
- dotnet: 3.1.403
7+
mono: latest
78

89
script:
9-
- xbuild /p:Configuration=Debug CSF.Zpt.sln
10-
- mono "./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe" $(find ./Tests/ -type f -path "*/bin/Debug/*" -name "Test*.dll")
10+
- dotnet test

‎.vscode/extensions.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"recommendations": [
3+
"ms-dotnettools.csharp",
4+
"jchannon.csharpextensions",
5+
"jorgeserrano.vscode-csharp-snippets",
6+
"k--kato.docomment",
7+
"github.vscode-pull-request-github",
8+
"heaths.vscode-guid",
9+
"ms-vscode.powershell"
10+
],
11+
"unwantedRecommendations": []
12+
}

‎.vscode/launch.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/ZptSharp.Tests/bin/Debug/netcoreapp3.1/ZptSharp.Tests.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/ZptSharp.Tests",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach",
24+
"processId": "${command:pickProcess}"
25+
}
26+
]
27+
}

‎.vscode/tasks.json‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"/property:GenerateFullPaths=true"
11+
],
12+
"group": {
13+
"kind": "build",
14+
"isDefault": true
15+
},
16+
"problemMatcher": "$msCompile"
17+
},
18+
{
19+
"label": "pack (debug)",
20+
"command": "dotnet",
21+
"type": "process",
22+
"args": [
23+
"pack",
24+
"-c",
25+
"Debug",
26+
"/property:GenerateFullPaths=true"
27+
],
28+
"group": "build",
29+
"problemMatcher": "$msCompile"
30+
},
31+
{
32+
"label": "pack (release)",
33+
"command": "dotnet",
34+
"type": "process",
35+
"args": [
36+
"pack",
37+
"-c",
38+
"Release",
39+
"/property:GenerateFullPaths=true"
40+
],
41+
"group": "build",
42+
"problemMatcher": "$msCompile"
43+
},
44+
{
45+
"label": "dotnet clean",
46+
"command": "dotnet",
47+
"type": "process",
48+
"args": [
49+
"clean"
50+
],
51+
"group": "none",
52+
"problemMatcher": "$msCompile"
53+
},
54+
{
55+
"label": "git clean",
56+
"command": "git",
57+
"type": "process",
58+
"args": [
59+
"clean",
60+
"-fdx"
61+
],
62+
"group": "none",
63+
"problemMatcher": []
64+
},
65+
{
66+
"label": "run tests (all)",
67+
"command": "dotnet",
68+
"type": "process",
69+
"args": [
70+
"test",
71+
"/property:GenerateFullPaths=true"
72+
],
73+
"group": {
74+
"kind": "test",
75+
"isDefault": true
76+
},
77+
"problemMatcher": "$msCompile"
78+
},
79+
{
80+
"label": "run tests (.NET Standard only)",
81+
"command": "dotnet",
82+
"type": "process",
83+
"args": [
84+
"test",
85+
"ZptSharp.Tests",
86+
"/property:GenerateFullPaths=true",
87+
"--settings=Tools\\Linux.runsettings"
88+
],
89+
"group": "test",
90+
"problemMatcher": "$msCompile"
91+
},
92+
{
93+
"label": "watched tests (.NET Standard only)",
94+
"command": "dotnet",
95+
"type": "process",
96+
"args": [
97+
"watch",
98+
"--project=ZptSharp.Tests",
99+
"test",
100+
"/property:GenerateFullPaths=true",
101+
"--settings=..\\Tools\\Linux.runsettings"
102+
],
103+
"group": "test",
104+
"problemMatcher": "$msCompile"
105+
},
106+
{
107+
"label": "run tests (.NET Framework/MVC5 only)",
108+
"command": "dotnet",
109+
"type": "process",
110+
"args": [
111+
"test",
112+
"MvcViewEngines\\ZptSharp.Mvc5.Tests",
113+
"/property:GenerateFullPaths=true",
114+
"--settings=Tools\\Linux.runsettings"
115+
],
116+
"group": "test",
117+
"problemMatcher": "$msCompile"
118+
},
119+
{
120+
"label": "run MVC5 Example app",
121+
"command": "xsp4",
122+
"type": "process",
123+
"args": [
124+
"--applications=/:Examples/ZptSharp.Examples.Mvc5",
125+
"--port=8080",
126+
"--root=$PWD/Examples/ZptSharp.Examples.Mvc5"
127+
],
128+
"group": "none",
129+
"problemMatcher": []
130+
},
131+
{
132+
"label": "run MVC Core Example app",
133+
"command": "dotnet",
134+
"type": "process",
135+
"args": [
136+
"run",
137+
"--project=Examples/ZptSharp.Examples.MvcCore/ZptSharp.Examples.MvcCore.csproj"
138+
],
139+
"group": "none",
140+
"problemMatcher": []
141+
},
142+
{
143+
"label": "run DocFx docs site",
144+
"command": "docfx",
145+
"type": "process",
146+
"args": [
147+
"serve",
148+
"ZptSharp.Documentation/_site"
149+
],
150+
"group": "none",
151+
"problemMatcher": []
152+
}
153+
]
154+
}

0 commit comments

Comments
 (0)