Skip to content

Commit b0c662d

Browse files
committed
Merge branch 'dev'
2 parents 08b7f12 + 74a2c99 commit b0c662d

File tree

130 files changed

+1354
-8562
lines changed

Some content is hidden

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

130 files changed

+1354
-8562
lines changed

.appveyor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 2.0.0-alpha.{build}+{branch}
2+
init:
3+
- git config --global core.autocrlf true
4+
clone_depth: 1
5+
branches:
6+
only:
7+
- master
8+
- dev
9+
- appveyor
10+
build_script:
11+
- ps: .\build.ps1
12+
environment:
13+
global:
14+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
15+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
16+
test: off
17+
os: Visual Studio 2017
18+
artifacts:
19+
- path: artifacts/*.nupkg
20+
name: Packages
21+
type: NuGetPackages
22+
deploy:
23+
- provider: NuGet
24+
skip_symbols: true
25+
api_key:
26+
secure: MIhcKhOCOJ64Cdf6S+uBuvKS0mSHsDSLxuXCAASqPDL/Wcgo8TAJMIR3p2Y4OqvP
27+
on:
28+
appveyor_repo_tag: true

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
root = true
2+
indent_style = space
3+
trim_trailing_whitespace = true
4+
insert_final_newline = true
5+
6+
[*.{xml,csproj,props,targets,config}]
7+
indent_size = 2
8+
9+
[*.cs]
10+
indent_size = 4

.gitignore

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ TestResults/
77
_ReSharper.*/
88
packages/
99
artifacts/
10-
.build/
1110
PublishProfiles/
1211
.vs/
1312
bower_components/
@@ -20,10 +19,7 @@ project.lock.json
2019
*.cache
2120
*.docstates
2221
_ReSharper.*
23-
nuget.exe
24-
*net45.csproj
25-
*net451.csproj
26-
*k10.csproj
22+
*.exe
2723
*.psess
2824
*.vsp
2925
*.pidb
@@ -34,5 +30,8 @@ nuget.exe
3430
*.ipch
3531
.settings
3632
*.sln.ide
37-
node_modules
33+
node_modules/
3834
**/[Cc]ompiler/[Rr]esources/**/*.js
35+
.vscode/
36+
global.json
37+
korebuild-lock.txt

.travis.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

CommandLineUtils.sln

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26124.0
5+
MinimumVisualStudioVersion = 15.0.26124.0
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{95D4B35E-0A21-4D64-8BAF-27DD6C019FC5}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McMaster.Extensions.CommandLineUtils", "src\CommandLineUtils\McMaster.Extensions.CommandLineUtils.csproj", "{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C4842A1B-019E-40FF-A396-CF5AFDE8FA54}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McMaster.Extensions.CommandLineUtils.Tests", "test\CommandLineUtils.Tests\McMaster.Extensions.CommandLineUtils.Tests.csproj", "{1258544C-1FDE-4810-9A1B-189A925E9B45}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{60B279C6-091B-4F3E-B21F-D71001C94660}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "samples\HelloWorld\HelloWorld.csproj", "{71521E54-158D-45D7-8746-4905E6B3EB21}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Debug|x64 = Debug|x64
22+
Debug|x86 = Debug|x86
23+
Release|Any CPU = Release|Any CPU
24+
Release|x64 = Release|x64
25+
Release|x86 = Release|x86
26+
EndGlobalSection
27+
GlobalSection(SolutionProperties) = preSolution
28+
HideSolutionNode = FALSE
29+
EndGlobalSection
30+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
31+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|x64.ActiveCfg = Debug|x64
34+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|x64.Build.0 = Debug|x64
35+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|x86.ActiveCfg = Debug|x86
36+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Debug|x86.Build.0 = Debug|x86
37+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|x64.ActiveCfg = Release|x64
40+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|x64.Build.0 = Release|x64
41+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|x86.ActiveCfg = Release|x86
42+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E}.Release|x86.Build.0 = Release|x86
43+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|x64.ActiveCfg = Debug|x64
46+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|x64.Build.0 = Debug|x64
47+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|x86.ActiveCfg = Debug|x86
48+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Debug|x86.Build.0 = Debug|x86
49+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|x64.ActiveCfg = Release|x64
52+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|x64.Build.0 = Release|x64
53+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|x86.ActiveCfg = Release|x86
54+
{1258544C-1FDE-4810-9A1B-189A925E9B45}.Release|x86.Build.0 = Release|x86
55+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|x64.ActiveCfg = Debug|x64
58+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|x64.Build.0 = Debug|x64
59+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|x86.ActiveCfg = Debug|x86
60+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Debug|x86.Build.0 = Debug|x86
61+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|Any CPU.Build.0 = Release|Any CPU
63+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|x64.ActiveCfg = Release|x64
64+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|x64.Build.0 = Release|x64
65+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|x86.ActiveCfg = Release|x86
66+
{71521E54-158D-45D7-8746-4905E6B3EB21}.Release|x86.Build.0 = Release|x86
67+
EndGlobalSection
68+
GlobalSection(NestedProjects) = preSolution
69+
{CBCFAFF3-A3B1-4C41-B2D1-092BF7307A4E} = {95D4B35E-0A21-4D64-8BAF-27DD6C019FC5}
70+
{1258544C-1FDE-4810-9A1B-189A925E9B45} = {C4842A1B-019E-40FF-A396-CF5AFDE8FA54}
71+
{71521E54-158D-45D7-8746-4905E6B3EB21} = {60B279C6-091B-4F3E-B21F-D71001C94660}
72+
EndGlobalSection
73+
EndGlobal

0 commit comments

Comments
 (0)