From 9dc6c4a466d746ca13f07a1f6f19c450284a46d5 Mon Sep 17 00:00:00 2001 From: Peter Dolkens Date: Wed, 5 Jul 2017 11:57:23 +0100 Subject: [PATCH 01/19] Add support for WithoutDefaultPort as WithPort doesn't allow "-1" to be sent to hide DefaultPorts --- .../ExtensionTests.cs | 16 ++++++++++++++++ .../TerribleDevUriExtensions.cs | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs b/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs index 238fbd2..6b2e1a1 100644 --- a/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs +++ b/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs @@ -78,6 +78,22 @@ namespace FluentUriBuilder.Tests Assert.Equal(url.Port, 22); } + [Fact] + public void WithoutDefaultPort() + { + var url = new UriBuilder("http://awesome.com:80") + .WithoutDefaultPort(); + Assert.Equal("http://awesome.com", url.Uri.ToString()); + + url = new UriBuilder("http://awesome.com:443") + .WithoutDefaultPort(); + Assert.Equal("http://awesome.com:443", url.Uri.ToString()); + + url = new UriBuilder("https://awesome.com:443") + .WithoutDefaultPort(); + Assert.Equal("https://awesome.com", url.Uri.ToString()); + } + [Fact] public void WithHttps() { diff --git a/src/UriBuilder.Fluent/TerribleDevUriExtensions.cs b/src/UriBuilder.Fluent/TerribleDevUriExtensions.cs index 357e8b7..06641aa 100644 --- a/src/UriBuilder.Fluent/TerribleDevUriExtensions.cs +++ b/src/UriBuilder.Fluent/TerribleDevUriExtensions.cs @@ -81,6 +81,17 @@ namespace System return bld; } + /// + /// Removes the port number for default ports + /// + /// + /// + public static UriBuilder WithoutDefaultPort(this UriBuilder bld) + { + if (bld.Uri.IsDefaultPort) bld.Port = -1; + return bld; + } + /// /// appends a path segment to the path. Can be called multiple times to append multiple segments /// From 526f7b04c84dfde1395fb89eda94d42a90f1d71d Mon Sep 17 00:00:00 2001 From: Peter Dolkens Date: Wed, 5 Jul 2017 12:00:24 +0100 Subject: [PATCH 02/19] Fix expected values --- src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs b/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs index 6b2e1a1..6aef3cb 100644 --- a/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs +++ b/src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs @@ -83,15 +83,15 @@ namespace FluentUriBuilder.Tests { var url = new UriBuilder("http://awesome.com:80") .WithoutDefaultPort(); - Assert.Equal("http://awesome.com", url.Uri.ToString()); + Assert.Equal("http://awesome.com/", url.Uri.ToString()); url = new UriBuilder("http://awesome.com:443") .WithoutDefaultPort(); - Assert.Equal("http://awesome.com:443", url.Uri.ToString()); + Assert.Equal("http://awesome.com:443/", url.Uri.ToString()); url = new UriBuilder("https://awesome.com:443") .WithoutDefaultPort(); - Assert.Equal("https://awesome.com", url.Uri.ToString()); + Assert.Equal("https://awesome.com/", url.Uri.ToString()); } [Fact] From 2011b935d940d2086d813be6269096dd067158a6 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:37:42 -0400 Subject: [PATCH 03/19] use new proj --- Coverage.ps1 | 4 +-- UriBuilder.Fluent.sln | 9 +++--- appveyor.yml | 19 ++++++----- global.json | 6 ---- .../Properties/AssemblyInfo.cs | 5 +-- .../UriBuilder.Fluent.UnitTests.csproj | 26 +++++++++++++++ .../UriBuilder.Fluent.UnitTests.xproj | 22 ------------- .../UriBuilder.Fluent.UnitTests.xproj.user | 6 ---- src/UriBuilder.Fluent.UnitTests/project.json | 22 ------------- .../Properties/AssemblyInfo.cs | 5 +-- .../UriBuilder.Fluent.csproj | 25 +++++++++++++++ src/UriBuilder.Fluent/UriBuilder.Fluent.xproj | 21 ------------ .../UriBuilder.Fluent.xproj.user | 6 ---- src/UriBuilder.Fluent/project.json | 32 ------------------- update-projectjson.ps1 | 16 ---------- 15 files changed, 68 insertions(+), 156 deletions(-) delete mode 100644 global.json create mode 100644 src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj delete mode 100644 src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj delete mode 100644 src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user delete mode 100644 src/UriBuilder.Fluent.UnitTests/project.json create mode 100644 src/UriBuilder.Fluent/UriBuilder.Fluent.csproj delete mode 100644 src/UriBuilder.Fluent/UriBuilder.Fluent.xproj delete mode 100644 src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user delete mode 100644 src/UriBuilder.Fluent/project.json delete mode 100644 update-projectjson.ps1 diff --git a/Coverage.ps1 b/Coverage.ps1 index f14d545..b4c6fc1 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -3,8 +3,8 @@ if($env:APPVEYOR_REPO_TAG -eq "true") "do not publish coverall data on tag builds" return } -nuget install OpenCover -Version 4.6.519 -OutputDirectory tools -nuget install coveralls.net -Version 0.7.0 -OutputDirectory tools +nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools +nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools .\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml diff --git a/UriBuilder.Fluent.sln b/UriBuilder.Fluent.sln index 34ef1a2..78c1153 100644 --- a/UriBuilder.Fluent.sln +++ b/UriBuilder.Fluent.sln @@ -1,20 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B4EB6F69-0F56-4875-95AD-E4DEB5D18A74}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AC680F4D-C1B2-4F06-8464-CC987B1F0008}" ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml - global.json = global.json Readme.md = Readme.md EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UriBuilder.Fluent", "src\UriBuilder.Fluent\UriBuilder.Fluent.xproj", "{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UriBuilder.Fluent", "src\UriBuilder.Fluent\UriBuilder.Fluent.csproj", "{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UriBuilder.Fluent.UnitTests", "src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.xproj", "{F421A9EE-180C-413E-A0CD-665295825646}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UriBuilder.Fluent.UnitTests", "src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj", "{F421A9EE-180C-413E-A0CD-665295825646}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/appveyor.yml b/appveyor.yml index fb44c71..4b51edf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,6 @@ +image: Visual Studio 2017 configuration: Release version: 1.0.{build} -nuget: - account_feed: true - project_feed: true artifacts: - path: 'src\**\*.nupkg' @@ -14,17 +12,18 @@ before_build: - ps: .\core.exe /install /quiet /norestart build_script: -- ps: dotnet restore -- ps: dotnet build -c Release .\src\UriBuilder.Fluent -- ps: dotnet build -c Release .\src\UriBuilder.Fluent.UnitTests +- ps: >- + dotnet restore HardHat.sln --source https://api.nuget.org/v3/index.json + dotnet build HardHat.sln + if($env:APPVEYOR_REPO_TAG -eq "true") + { + dotnet pack src\HardHat\HardHat.csproj --configuration Release --output ..\..\output /p:Version=$env:APPVEYOR_REPO_TAG_NAME + } test_script: -- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests +- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj - ps: .\Coverage.ps1 -- ps: .\update-projectjson.ps1 -- ps: dotnet restore -- ps: dotnet pack -c Release .\src\UriBuilder.Fluent deploy: - provider: NuGet diff --git a/global.json b/global.json deleted file mode 100644 index 9d09ab5..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} diff --git a/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs b/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs index b647517..b73dd37 100644 --- a/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs +++ b/src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs @@ -5,10 +5,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UriBuilder.Fluent.UnitTests")] -[assembly: AssemblyTrademark("")] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj new file mode 100644 index 0000000..3db697d --- /dev/null +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -0,0 +1,26 @@ + + + + net461;netcoreapp1.0 + UriBuilder.Fluent.UnitTests + UriBuilder.Fluent.UnitTests + true + 1.0.4 + + + + + + + + + + + + + + + + + + diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj deleted file mode 100644 index 0de6deb..0000000 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f421a9ee-180c-413e-a0cd-665295825646 - UriBuilder.Fluent.UnitTests - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user deleted file mode 100644 index c99c608..0000000 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - Start - - \ No newline at end of file diff --git a/src/UriBuilder.Fluent.UnitTests/project.json b/src/UriBuilder.Fluent.UnitTests/project.json deleted file mode 100644 index 8dbb8b4..0000000 --- a/src/UriBuilder.Fluent.UnitTests/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "testRunner": "xunit", - - "dependencies": { - "xunit": "2.2.0-beta2-build3300", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "UriBuilder.Fluent": "1.0.0-*" - }, - - "frameworks": { - "net461":{}, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - } - } -} \ No newline at end of file diff --git a/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs b/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs index 5843dcc..6a8f0f1 100644 --- a/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs +++ b/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs @@ -5,10 +5,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UriBuilder.Fluent")] -[assembly: AssemblyTrademark("")] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj new file mode 100644 index 0000000..ad61e8a --- /dev/null +++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj @@ -0,0 +1,25 @@ + + + + Tommy Parnell + netstandard1.1;net40;net45 + UriBuilder.Fluent + UriBuilder.Fluent + Url building;Uri;Uri building;fluent;extension + https://github.com/TerribleDev/UriBuilder.Fluent + $(PackageTargetFallback);dnxcore50 + 1.6.0 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + + diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj deleted file mode 100644 index d1dbff1..0000000 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - b8458f59-debd-4844-aa29-ee3b4388aa7a - UriBuilder.Fluent - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user b/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user deleted file mode 100644 index c99c608..0000000 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - Start - - \ No newline at end of file diff --git a/src/UriBuilder.Fluent/project.json b/src/UriBuilder.Fluent/project.json deleted file mode 100644 index e7196e3..0000000 --- a/src/UriBuilder.Fluent/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.0.0-*", - "packOptions": { - "owners": [ - "Tommy Parnell" - ], - "projectUrl": "https://github.com/TerribleDev/UriBuilder.Fluent", - "summary": "Fluent extensions for UriBuilder", - "tags": [ - "Url building", - "Uri", - "Uri building", - "fluent", - "extension" - ] - }, - "authors": [ - "Tommy Parnell" - ], - "frameworks": { - "netstandard1.1": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.6.0" - } - }, - "net40": { - "imports": "dnxcore50" - }, - "net45":{} - } -} diff --git a/update-projectjson.ps1 b/update-projectjson.ps1 deleted file mode 100644 index aa42f15..0000000 --- a/update-projectjson.ps1 +++ /dev/null @@ -1,16 +0,0 @@ -$projectJsonFileLocation = "src/UriBuilder.Fluent/project.json" -$newVersion = $env:APPVEYOR_REPO_TAG_NAME -if($newVersion -eq $null) -{ - $newVersion = "1.0.0-${env:APPVEYOR_BUILD_NUMBER}" -} -if($newVersion -eq $null) -{ - return -} - -Write-Host "$projectJsonFileLocation will be update with new version '$newVersion'" - -$json = (Get-Content $projectJsonFileLocation -Raw) | ConvertFrom-Json -$json.version = $newVersion -$json | ConvertTo-Json -depth 100 | Out-File $projectJsonFileLocation \ No newline at end of file From ec67f8ad1d4f2b568516bca8bf927ec8b43b329a Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:38:58 -0400 Subject: [PATCH 04/19] fix ref --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4b51edf..dbb43a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 configuration: Release version: 1.0.{build} artifacts: - - path: 'src\**\*.nupkg' +- path: output\**.nupkg init: - git config --global core.autocrlf true @@ -13,11 +13,11 @@ before_build: build_script: - ps: >- - dotnet restore HardHat.sln --source https://api.nuget.org/v3/index.json - dotnet build HardHat.sln + dotnet restore UriBuilder.Fluent.sln --source https://api.nuget.org/v3/index.json + dotnet build UriBuilder.Fluent.sln if($env:APPVEYOR_REPO_TAG -eq "true") { - dotnet pack src\HardHat\HardHat.csproj --configuration Release --output ..\..\output /p:Version=$env:APPVEYOR_REPO_TAG_NAME + dotnet pack src\UriBuilder.Fluent\UriBuilder.Fluent.csproj --configuration Release --output ..\..\output /p:Version=$env:APPVEYOR_REPO_TAG_NAME } From 68956cded5c294b6b9b19be615cad0bf9f4e4b4e Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:39:51 -0400 Subject: [PATCH 05/19] dont download core --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dbb43a1..cc6ab70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,10 +6,6 @@ artifacts: init: - git config --global core.autocrlf true - -before_build: -- ps: invoke-webrequest https://go.microsoft.com/fwlink/?LinkID=827524 -OutFile core.exe -- ps: .\core.exe /install /quiet /norestart build_script: - ps: >- From bb75e3006e04bc64093ed29de6e4007caee3d5f3 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:40:56 -0400 Subject: [PATCH 06/19] fix coverage script --- Coverage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index b4c6fc1..8af8c6e 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file From 84742e8f47709b70938d1c140e8a81a22e560f44 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:51:00 -0400 Subject: [PATCH 07/19] build with full for coveralls --- .../UriBuilder.Fluent.UnitTests.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index 3db697d..cf414b6 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -4,8 +4,6 @@ net461;netcoreapp1.0 UriBuilder.Fluent.UnitTests UriBuilder.Fluent.UnitTests - true - 1.0.4 From 00f8f60971ca2e5b87b4240fa8454c042ba7dcc4 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:51:15 -0400 Subject: [PATCH 08/19] build with full for coveralls --- Coverage.ps1 | 2 +- appveyor.yml | 4 +++- src/UriBuilder.Fluent/UriBuilder.Fluent.csproj | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index 8af8c6e..d67284f 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "" .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" --no-build -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index cc6ab70..6b38974 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,9 @@ build_script: test_script: -- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj +- ps: dotnet clean +- ps: dotnet build /p:DebugType=full +- ps: dotnet test .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj --no-build - ps: .\Coverage.ps1 deploy: diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj index ad61e8a..6e80dea 100644 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj +++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj @@ -7,9 +7,6 @@ UriBuilder.Fluent Url building;Uri;Uri building;fluent;extension https://github.com/TerribleDev/UriBuilder.Fluent - $(PackageTargetFallback);dnxcore50 - 1.6.0 - $(PackageTargetFallback);dnxcore50 From 58f03ea1afa1aad5307189b560e9b83c408a49f9 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:52:26 -0400 Subject: [PATCH 09/19] build in release --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6b38974..e63c2d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ init: build_script: - ps: >- dotnet restore UriBuilder.Fluent.sln --source https://api.nuget.org/v3/index.json - dotnet build UriBuilder.Fluent.sln + dotnet build UriBuilder.Fluent.sln --configuration Release if($env:APPVEYOR_REPO_TAG -eq "true") { dotnet pack src\UriBuilder.Fluent\UriBuilder.Fluent.csproj --configuration Release --output ..\..\output /p:Version=$env:APPVEYOR_REPO_TAG_NAME From ad7ff272a65081cf42362d7fd6ed34219ea77090 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 16:53:27 -0400 Subject: [PATCH 10/19] fix script --- Coverage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index d67284f..7447fa2 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "" .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" --no-build -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461 --no-build" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file From fa1e78cb2409ad4aa16f8fd4dbb30b67a0c921ef Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:02:49 -0400 Subject: [PATCH 11/19] full pdb files --- Coverage.ps1 | 2 +- appveyor.yml | 4 +--- .../UriBuilder.Fluent.UnitTests.csproj | 1 + src/UriBuilder.Fluent/UriBuilder.Fluent.csproj | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index 7447fa2..8af8c6e 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461 --no-build" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index e63c2d6..154a42f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,9 +18,7 @@ build_script: test_script: -- ps: dotnet clean -- ps: dotnet build /p:DebugType=full -- ps: dotnet test .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj --no-build +- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj - ps: .\Coverage.ps1 deploy: diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index cf414b6..7557e08 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -4,6 +4,7 @@ net461;netcoreapp1.0 UriBuilder.Fluent.UnitTests UriBuilder.Fluent.UnitTests + full diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj index 6e80dea..d80ff44 100644 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj +++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj @@ -7,6 +7,7 @@ UriBuilder.Fluent Url building;Uri;Uri building;fluent;extension https://github.com/TerribleDev/UriBuilder.Fluent + full From 87e9cb4b85be1a1f1472fa0dd36fd432a2adc00a Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:05:52 -0400 Subject: [PATCH 12/19] fix xunit --- .../UriBuilder.Fluent.UnitTests.csproj | 6 ++---- src/UriBuilder.Fluent/UriBuilder.Fluent.csproj | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index 7557e08..db89d0a 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -4,7 +4,6 @@ net461;netcoreapp1.0 UriBuilder.Fluent.UnitTests UriBuilder.Fluent.UnitTests - full @@ -12,9 +11,8 @@ - - - + + diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj index d80ff44..6e80dea 100644 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj +++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj @@ -7,7 +7,6 @@ UriBuilder.Fluent Url building;Uri;Uri building;fluent;extension https://github.com/TerribleDev/UriBuilder.Fluent - full From 63c25a8c6e041f7c0ba9950677e71e9789ccb35a Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:09:51 -0400 Subject: [PATCH 13/19] add test adapter back --- .../UriBuilder.Fluent.UnitTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index db89d0a..7d167cc 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -13,6 +13,7 @@ + From a75d4fab2aafdb253e4881265691569e51e30936 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:23:38 -0400 Subject: [PATCH 14/19] try again --- .vscode/launch.json | 23 ----------------- .vscode/tasks.json | 16 ------------ .../UriBuilder.Fluent.UnitTests.csproj | 25 ++++++------------- .../Properties/AssemblyInfo.cs | 1 - 4 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index e464a79..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": ".NET Core Launch (console)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - "program": "${workspaceRoot}/bin/Debug//", - "args": [], - "cwd": "${workspaceRoot}", - "externalConsole": false, - "stopAtEntry": false, - "internalConsoleOptions": "openOnSessionStart" - }, - { - "name": ".NET Core Attach", - "type": "coreclr", - "request": "attach", - "processId": "${command.pickProcess}" - } - ] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index c73077e..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "0.1.0", - "command": "dotnet", - "isShellCommand": true, - "args": [], - "tasks": [ - { - "taskName": "build", - "args": [ - "" - ], - "isBuildCommand": true, - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index 7d167cc..a1ee622 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -1,24 +1,13 @@  - - net461;netcoreapp1.0 - UriBuilder.Fluent.UnitTests - UriBuilder.Fluent.UnitTests + netcoreapp1.1 - + + + + + - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs b/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs index 6a8f0f1..bd59ce9 100644 --- a/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs +++ b/src/UriBuilder.Fluent/Properties/AssemblyInfo.cs @@ -6,7 +6,6 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. From 65b437f5f3fe115350174e834c844e2776ead949 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:27:09 -0400 Subject: [PATCH 15/19] target multi frame --- .../UriBuilder.Fluent.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index a1ee622..715e99b 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp1.1 + netcoreapp1.1;net461 From 4db92f496504c297f27ba7a7bbc9ac397dd043f4 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:31:26 -0400 Subject: [PATCH 16/19] try a seperate build for coverage --- Coverage.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index 8af8c6e..2d2334c 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,8 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +dotnet build --configuration Release /p:DebugType=full + +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461 --no-build" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file From edfb21960a9ff85bea95a1a99eb5288a93b90e02 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:33:55 -0400 Subject: [PATCH 17/19] one more try --- Coverage.ps1 | 4 +--- .../UriBuilder.Fluent.UnitTests.csproj | 1 + src/UriBuilder.Fluent/UriBuilder.Fluent.csproj | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index 2d2334c..8af8c6e 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,8 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -dotnet build --configuration Release /p:DebugType=full - -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461 --no-build" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file diff --git a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj index 715e99b..fd6d31d 100644 --- a/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj +++ b/src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj @@ -1,6 +1,7 @@  netcoreapp1.1;net461 + full diff --git a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj index 6e80dea..d80ff44 100644 --- a/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj +++ b/src/UriBuilder.Fluent/UriBuilder.Fluent.csproj @@ -7,6 +7,7 @@ UriBuilder.Fluent Url building;Uri;Uri building;fluent;extension https://github.com/TerribleDev/UriBuilder.Fluent + full From 4ce00cf6bb87b801e712358488d612f7eefc6a79 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:37:03 -0400 Subject: [PATCH 18/19] oldstyle --- Coverage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Coverage.ps1 b/Coverage.ps1 index 8af8c6e..be155c2 100644 --- a/Coverage.ps1 +++ b/Coverage.ps1 @@ -6,6 +6,6 @@ if($env:APPVEYOR_REPO_TAG -eq "true") nuget install OpenCover -Source https://api.nuget.org/v3/index.json -Version 4.6.519 -OutputDirectory tools nuget install coveralls.net -Source https://api.nuget.org/v3/index.json -Version 0.7.0 -OutputDirectory tools -.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml +.\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -oldStyle -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:" test "".\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj"" -f net461 --no-build" -register:user -filter:"+[UriBuilder*]* -[*Tests]*" -returntargetcode -output:opencover_results.xml .\tools\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml \ No newline at end of file From 8b66bdcd92ce2234b7788226caac879cfb6c28e1 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 5 Jul 2017 17:39:27 -0400 Subject: [PATCH 19/19] remove code coverage for now --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 154a42f..e0550c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,6 @@ build_script: test_script: - ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj -- ps: .\Coverage.ps1 deploy: - provider: NuGet