Skip to content

Commit 007dde4

Browse files
authored
Merge pull request #2 from alphaleonis/dev
Fixed many bugs and prototyped a few new features.
2 parents 5b4d686 + 11ed0ca commit 007dde4

File tree

73 files changed

+2817
-1894
lines changed

Some content is hidden

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

73 files changed

+2817
-1894
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,11 @@ paket-files/
263263
*.sln.iml
264264

265265
# CodeRush
266-
.cr/
267266

268267
# Python Tools for Visual Studio (PTVS)
269268
__pycache__/
270269
*.pyc
271270

272271
### VisualStudio Patch ###
273-
build/
272+
build/
273+
/Alphaleonis.Reflection.projectSets.json

Alphaleonis.Reflection.sln

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27428.2037
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "ConsoleTest\ConsoleTest.csproj", "{BB069DCB-3610-42A3-975F-F9D6A2F4B425}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Alphaleonis.Reflection", "tests\Tests.Alphaleonis.Reflection.csproj", "{177FC80D-4932-440E-91E9-77C403DD2179}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Alphaleonis.Reflection", "tests\Tests.Alphaleonis.Reflection.csproj", "{177FC80D-4932-440E-91E9-77C403DD2179}"
97
EndProject
108
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E07584C0-538E-4AD5-B741-B36FEB7FBAA1}"
119
ProjectSection(SolutionItems) = preProject
@@ -15,18 +13,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1513
README.md = README.md
1614
EndProjectSection
1715
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alphaleonis.Reflection", "src\Alphaleonis.Reflection\Alphaleonis.Reflection.csproj", "{FD2A88BB-9E97-4956-8D47-5C7E9A0402FF}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alphaleonis.Reflection", "src\Alphaleonis.Reflection\Alphaleonis.Reflection.csproj", "{FD2A88BB-9E97-4956-8D47-5C7E9A0402FF}"
1917
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2220
Debug|Any CPU = Debug|Any CPU
2321
Release|Any CPU = Release|Any CPU
2422
EndGlobalSection
2523
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{BB069DCB-3610-42A3-975F-F9D6A2F4B425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{BB069DCB-3610-42A3-975F-F9D6A2F4B425}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{BB069DCB-3610-42A3-975F-F9D6A2F4B425}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{BB069DCB-3610-42A3-975F-F9D6A2F4B425}.Release|Any CPU.Build.0 = Release|Any CPU
3024
{177FC80D-4932-440E-91E9-77C403DD2179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3125
{177FC80D-4932-440E-91E9-77C403DD2179}.Debug|Any CPU.Build.0 = Debug|Any CPU
3226
{177FC80D-4932-440E-91E9-77C403DD2179}.Release|Any CPU.ActiveCfg = Release|Any CPU

ConsoleTest/App.config

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

ConsoleTest/ConsoleTest.csproj

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

ConsoleTest/Program.cs

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

ConsoleTest/Properties/AssemblyInfo.cs

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

appveyor.yml

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
1-
version: 0.1.{build}
21
image: Visual Studio 2017
32
configuration: Release
43

54
environment:
6-
packageVersion: 0.1.0
5+
semVersion: 0.2.0
76

87
init:
9-
- ps: $env:buildVersion = "$env:packageVersion.$env:APPVEYOR_BUILD_NUMBER"
10-
- ps: $env:nugetVersion = @{ $false = "$env:packageVersion-beta-{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $true = "$env:packageVersion" }[ $env:APPVEYOR_REPO_BRANCH -eq "master" ]
8+
- ps: $env:buildVersion = "$env:semVersion.$env:APPVEYOR_BUILD_NUMBER"
9+
- ps: $env:nugetVersionSuffix = @{ $false = "dev-{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $true = "beta" }[ $env:APPVEYOR_REPO_BRANCH -eq "master" ]
10+
- ps: 'Write-Host "buildVersion: $($env:buildVersion)"'
11+
- ps: 'Write-Host "nugetVersionSuffix: $($env:nugetVersionSuffix)"'
1112
- ps: Update-AppveyorBuild -Version $env:buildVersion
13+
- cmd: dotnet --version
1214

13-
assembly_info:
14-
patch: true
15-
file: '**\AssemblyInfo.*'
16-
assembly_version: '{version}'
17-
assembly_file_version: '{version}'
18-
assembly_informational_version: '{version}'
15+
dotnet_csproj:
16+
patch: false
1917

2018
nuget:
21-
account_feed: true
22-
project_feed: true
19+
account_feed: false
20+
project_feed: false
2321
disable_publish_on_pr: true
2422

25-
before_build:
26-
- cmd: nuget restore
23+
install:
24+
- cmd: dotnet restore --verbosity m
2725

28-
build:
29-
publish_nuget: false
30-
verbosity: minimal
26+
build_script:
27+
- ps: 'dotnet build -p:Version="$($env:buildVersion)" -p:AssemblyVersion="$($env:semVersion).0" -p:FileVersion=$env:buildVersion'
3128

3229
after_build:
33-
- ps: nuget pack src\Alphaleonis.Reflection\Alphaleonis.Reflection.nuspec -OutputDirectory .\artifacts -version "$env:nugetVersion"
30+
- ps: 'dotnet pack src\Alphaleonis.Reflection --version-suffix "$($env:nugetVersionSuffix)" --no-restore --no-build -p:VersionPrefix="$($env:semVersion)"'
3431

3532
artifacts:
3633
- path: '**\*.nupkg'
@@ -43,11 +40,3 @@ deploy:
4340
secure: PnuQGphn/9gGaVZRnUejvcijO8H5cJyoYPAekBvC4n8=
4441
skip_symbols: true
4542
artifact: /.*\.nupkg/
46-
47-
#deploy:
48-
#- provider: NuGet
49-
# api_key:
50-
# secure: kKYxxjMz8YoTTjZ6ccVtkPXhadPrXgW2SWYxwcDlFDx75i+xVm4veu4p1QJQBSOF
51-
# skip_symbols: true
52-
# on:
53-
# branch: master

0 commit comments

Comments
 (0)