Skip to content

Commit

Permalink
Misc refactor to NETCore 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kroniak committed Jul 11, 2016
1 parent 78f6021 commit bd89690
Show file tree
Hide file tree
Showing 47 changed files with 1,067 additions and 9,689 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,5 @@ _Pvt_Extensions

# FAKE - F# Make
.fake/
*.db
/build/1
9 changes: 2 additions & 7 deletions src/Flurl.Http.Xml.sln → Flurl.Http.Xml.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Flurl.Http.Xml.Shared", "Flurl.Http.Xml.Shared\Flurl.Http.Xml.Shared.shproj", "{16A3075D-B39A-44E4-9A4F-5855392B40C7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F2114366-0322-434F-91D3-A25939F0CFA7}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http.Xml.Tests", "..\test\Flurl.Http.Xml.Tests\Flurl.Http.Xml.Tests.xproj", "{7BA9BC27-1501-47EA-90FF-BCDBD25CA8B8}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http.Xml.Tests", "test\Flurl.Http.Xml.Tests\Flurl.Http.Xml.Tests.xproj", "{7BA9BC27-1501-47EA-90FF-BCDBD25CA8B8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http.Xml", "Flurl.Http.Xml\Flurl.Http.Xml.xproj", "{B9826CF6-17DD-4D2D-A6BD-F15CFA18F9CB}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Flurl.Http.Xml", "src\Flurl.Http.Xml\Flurl.Http.Xml.xproj", "{B9826CF6-17DD-4D2D-A6BD-F15CFA18F9CB}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Flurl.Http.Xml.Shared\Flurl.Http.Xml.Shared.projitems*{16a3075d-b39a-44e4-9a4f-5855392b40c7}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down
28 changes: 9 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
version: 1.2.0.{build}
version: 1.3.0.{build}
branches:
only:
- master
pull_requests:
do_not_increment_build_number: true
configuration: Release
platform: Any CPU
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_informational_version: '{version}'
before_build:
- cmd: >-
cd src
nuget restore
cd ..
build:
publish_nuget: false
verbosity: minimal
install:
- ps: .\build\install.ps1
build_script:
- ps: .\build\build.ps1 $env:APPVEYOR_BUILD_VERSION $env:APPVEYOR_REPO_TAG_NAME
test_script:
- ps: .\build\test.ps1
artifacts:
- path: '**\*.nupkg'
deploy:
- provider: NuGet
api_key:
Expand Down
21 changes: 21 additions & 0 deletions build/build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
param (
[string]$BuildVersionNumber=$(throw "-BuildVersionNumber is required."),
[string]$TagVersionNumber
)
# Set the version number in package.json
$ProjectJsonPath = Join-Path -Path $PSScriptRoot\..\ -ChildPath "src\Flurl.Http.Xml\project.json"
if ($TagVersionNumber){
(gc -Path $ProjectJsonPath) `
-replace "(?<=`"version`":\s`")[.\w-]*(?=`",)", "$TagVersionNumber" |
sc -Path $ProjectJsonPath -Encoding UTF8
}
else {
(gc -Path $ProjectJsonPath) `
-replace "(?<=`"version`":\s`")[.\w-]*(?=`",)", "$BuildVersionNumber" |
sc -Path $ProjectJsonPath -Encoding UTF8
}
# run restore on all project.json files in the src folder including 2>1 to redirect stderr to stdout for badly behaved tools
Get-ChildItem -Path $PSScriptRoot\..\src -Filter project.json -Recurse | ForEach-Object { & dotnet restore $_.FullName 2>1 }

# run pack on all project.json files in the src folder including 2>1 to redirect stderr to stdout for badly behaved tools
Get-ChildItem -Path $PSScriptRoot\..\src -Filter project.json -Recurse | ForEach-Object { & dotnet pack $_.FullName -c Release 2>1 }
Loading

0 comments on commit bd89690

Please sign in to comment.