Merge pull request #25 from TerribleDev/pr-24

PR-24

.github/workflows/pr.yml

@@ -0,0 +1,44 @@
+name: PR Build
+on:
+  pull_request:
+    branches:
+      - master
+jobs:
+  # dotnet test
+  build-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Build 
+        run: make build
+      - name: Test
+        run: make test
+  pack:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Pack
+        run: VERSION=0.0.1 make pack
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: pr-build-${{ github.event.pull_request.number }}-${{ github.sha }}
+          path: ./output/**
+  check-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Check Format
+        run: make check-format

.github/workflows/publish.yml

@@ -0,0 +1,73 @@
+name: Publish
+on:
+  push:
+    branches:
+      - master
+jobs:
+  check-format:
+    environment: master
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Check Format
+        run: make check-format
+  test:
+    environment: master
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Build 
+        run: make build
+      - name: Test
+        run: make test
+      - name: Upload Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: ./src/UriBuilder.Fluent.UnitTests/coverage.info
+  tag:
+    needs: [check-format, test]
+    outputs:
+      tagVersion: ${{ steps.tagVersion.outputs.new_tag }}
+    runs-on: ubuntu-latest
+    environment: master
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: false
+          DEFAULT_BUMP: minor
+        id: tagVersion
+  build:
+    env:
+      VERSION: ${{ needs.tag.outputs.tagVersion }}
+      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+    runs-on: ubuntu-latest
+    environment: master
+    needs: [check-format, test, tag]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x.x
+      - name: Build and Pack
+        run: make pack
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-build-${{ needs.tag.outputs.tagVersion }}
+          path: ./output/**
+      - name: Publish to NuGet
+        run: make publish

.gitignore

@@ -148,6 +148,7 @@ publish/
 
 # NuGet Packages
 *.nupkg
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/packages/*
 # except build/, which is used as an MSBuild target.
@@ -242,4 +243,10 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
+.fake/
+.idea
+coverage.opencover.xml
+coverage.json
+coverage.info
+.DS_Store
+output

.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Launch (console)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/<target-framework>/<project-name.dll>",
-            "args": [],
-            "cwd": "${workspaceRoot}",
-            "externalConsole": false,
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart"
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command.pickProcess}"
-        }
-    ]
-}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "UriBuilder.Fluent.sln"
+}

.vscode/tasks.json

@@ -1,16 +0,0 @@
-{
-    "version": "0.1.0",
-    "command": "dotnet",
-    "isShellCommand": true,
-    "args": [],
-    "tasks": [
-        {
-            "taskName": "build",
-            "args": [
-                ""
-            ],
-            "isBuildCommand": true,
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}

Coverage.ps1

@@ -1,11 +0,0 @@
-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
-
-.\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\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe --opencover -i .\opencover_results.xml

Makefile

@@ -0,0 +1,21 @@
+clean:
+	dotnet clean && rm -rf ./**/bin ./**/obj && rm -rf output
+build: clean restore
+	dotnet build --no-restore
+restore: clean
+	dotnet restore
+test:
+	dotnet test /p:CollectCoverage=true
+release-build: clean restore
+	dotnet build -c Release --no-restore 
+pack: release-build
+	dotnet pack src/UriBuilder.Fluent/UriBuilder.Fluent.csproj --configuration Release --output output
+publish:
+	dotnet nuget push output/*.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key $(NUGET_API_KEY)
+	dotnet nuget push output/*.snupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key $(NUGET_API_KEY)
+coveralls-push:
+	dotnet tool install -g coveralls.net
+	coverallsnet --opencover -i UriBuilder.Fluent.UnitTests/coverage.opencover.xml --useRelativePaths
+check-format:
+	dotnet format --verify-no-changes
+default: clean build

Readme.md

@@ -1,10 +1,15 @@
-## UriBuilder.Fluent
+# UriBuilder.Fluent
 [![Coverage Status](https://coveralls.io/repos/github/TerribleDev/UriBuilder.Fluent/badge.svg)](https://coveralls.io/github/TerribleDev/UriBuilder.Fluent) [![Build status](https://ci.appveyor.com/api/projects/status/cp704w3bgaerufxm/branch/master?svg=true)](https://ci.appveyor.com/project/tparnell8/uribuilder-fluent/branch/master)
 
 This places extension methods over System.UriBuilder to help deal with query string parameters, and create more of a fluent interface. Unlike other projects, this NetStandardLibrary compliant package builds ontop of trusty UriBuilder, does not use custom Uri generators, or have outside dependencies. Unit tests continue to be a first class citizen!
 
-This lets you do things like
+## Getting started
 
+Just install the nuget package `install-package UriBuilder.Fluent` and thats it. The extension methods should be available to you!
+
+## Code Example
+
+This lets you do things like
 
 ```csharp
 
@@ -14,10 +19,9 @@ new UriBuilder()
          .WithHost("awesome.com")
          .WithPathSegment("seg")
          .UseHttps()
+         .Uri
          .ToString()
 
-
-
 ```
 result: `https://awesome.com/seg?awesome=yodawg&fun=cool,yay`
 
@@ -27,11 +31,53 @@ or
 
 new UriBuilder("https://awesome.com/yo)
     .WithParameter("id", "5")
+    .Uri
     .ToString();
 
 ```
 result: `https://awesome.com/yo?id=5`
 
-## Getting started
+you can even pass a dictionary of parameters
 
-Just install the nuget package `install-package UriBuilder.Fluent` and thats it. The extension methods should be available to you!
+```csharp
+
+var dictionary = new Dictionary<string, string>()
+{
+    ["yo"] = "dawg"
+};
+
+new UriBuilder("http://awesome.com")
+        .WithParameter(dictionary);
+
+```
+result: `http://awesome.com/?yo=dawg`
+
+### ToEscapeString() vs. ToEscapeDataString()
+
+There are two extension methods for performing Uri encoding.
+
+#### ToEscapeString() 
+Performs encoding only on the Uri query string and returns the Uri as a string.
+
+```csharp
+
+var uri = new UriBuilder("https://awesome.com")
+    .WithParameter("yo", "dawg<")
+    .ToEscapeString();
+
+```
+
+result: `http://awesome.com/?yo=dawg%3C`
+
+#### ToEscapeDataString() 
+Performs encoding on the whole Uri and returns the Uri as a string.
+
+```csharp
+
+var uri = new UriBuilder("https://awesome.com")
+    .WithParameter("yo", "dawg<")
+    .ToEscapeDataString();
+
+```
+
+result: `http%3A%2F%2Fawesome.com%2F%3Fyo%3Ddawg%3C`

UriBuilder.Fluent.sln

@@ -1,41 +1,34 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio Version 17
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B4EB6F69-0F56-4875-95AD-E4DEB5D18A74}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE84C3E5-BA06-4A89-A786-62423FF4A87F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AC680F4D-C1B2-4F06-8464-CC987B1F0008}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UriBuilder.Fluent", "src\UriBuilder.Fluent\UriBuilder.Fluent.csproj", "{81D561B6-AB75-4A65-B770-20EEF16E6AF7}"
-	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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UriBuilder.Fluent.UnitTests", "src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj", "{87BEA737-87E0-4114-986F-6080FA58B187}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UriBuilder.Fluent.UnitTests", "src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.xproj", "{F421A9EE-180C-413E-A0CD-665295825646}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8458F59-DEBD-4844-AA29-EE3B4388AA7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F421A9EE-180C-413E-A0CD-665295825646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F421A9EE-180C-413E-A0CD-665295825646}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F421A9EE-180C-413E-A0CD-665295825646}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F421A9EE-180C-413E-A0CD-665295825646}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{81D561B6-AB75-4A65-B770-20EEF16E6AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81D561B6-AB75-4A65-B770-20EEF16E6AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81D561B6-AB75-4A65-B770-20EEF16E6AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81D561B6-AB75-4A65-B770-20EEF16E6AF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87BEA737-87E0-4114-986F-6080FA58B187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87BEA737-87E0-4114-986F-6080FA58B187}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87BEA737-87E0-4114-986F-6080FA58B187}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87BEA737-87E0-4114-986F-6080FA58B187}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B8458F59-DEBD-4844-AA29-EE3B4388AA7A} = {B4EB6F69-0F56-4875-95AD-E4DEB5D18A74}
+		{81D561B6-AB75-4A65-B770-20EEF16E6AF7} = {BE84C3E5-BA06-4A89-A786-62423FF4A87F}
-		{F421A9EE-180C-413E-A0CD-665295825646} = {B4EB6F69-0F56-4875-95AD-E4DEB5D18A74}
+		{87BEA737-87E0-4114-986F-6080FA58B187} = {BE84C3E5-BA06-4A89-A786-62423FF4A87F}
 	EndGlobalSection
 EndGlobal

appveyor.yml

@@ -1,34 +0,0 @@
-configuration: Release
-version: 1.0.{build}
-nuget:
-  account_feed: true
-  project_feed: true
-artifacts:
-  - path: 'src\**\*.nupkg'
-  
-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: dotnet restore
-- ps: dotnet build -c Release .\src\UriBuilder.Fluent
-- ps: dotnet build -c Release .\src\UriBuilder.Fluent.UnitTests
-
-
-test_script:
-- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests
-- ps: .\Coverage.ps1
-- ps: .\update-projectjson.ps1
-- ps: dotnet restore
-- ps: dotnet pack -c Release .\src\UriBuilder.Fluent
-
-deploy:
-- provider: NuGet
-  api_key:
-    secure: QuVcKEvDkLsmdemVpoGBXiTymN46CzvczrDpTHNf1+tTIjOGufptGDmBD9r5LVtn
-  on:
-    appveyor_repo_tag: true

global.json

@@ -1,6 +1,7 @@
-{
+{
-  "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-preview2-003131"
+    "version": "7.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
   }
-}
+}

src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs

@@ -16,7 +16,7 @@ namespace FluentUriBuilder.Tests
         {
             var url = new UriBuilder("http://awesome.com")
                 .WithPathSegment(pathWithSlashes);
-            Assert.Equal("http://awesome.com/" + expectedPath, url.Uri.ToString());
+            Assert.Equal("http://awesome.com/" + expectedPath, url.ToUriString());
         }
 
         [Fact]
@@ -25,7 +25,7 @@ namespace FluentUriBuilder.Tests
             var url = new UriBuilder("http://awesome.com")
                 .WithPathSegment("yodawg")
                 .WithPathSegment("/immahslash/");
-            Assert.Equal("http://awesome.com/yodawg/immahslash/", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/yodawg/immahslash/", url.ToUriString());
         }
 
         [Fact]
@@ -33,7 +33,28 @@ namespace FluentUriBuilder.Tests
         {
             var url = new UriBuilder("http://awesome.com")
                     .WithParameter("awesome", "yodawg");
-            Assert.Equal("http://awesome.com/?awesome=yodawg", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome=yodawg", url.ToUriString());
+        }
+        [Fact]
+        public void TestAddUrlParameterAsTupleList()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                    .WithParameter(new List<(string, string)>()
+                    {
+                        ("awesome", "yodawg")
+                    });
+            Assert.Equal("http://awesome.com/?awesome=yodawg", url.ToUriString());
+        }
+
+        [Fact]
+        public void PathAndQuery()
+        {
+            var url = new UriBuilder().WithPathSegment("/awesome/v1/").WithParameter("awesome", "cool").PathAndQuery();
+            Assert.Equal("/awesome/v1/?awesome=cool", url);
+            url = new UriBuilder().WithPathSegment("/awesome/v1").WithParameter("awesome", "cool").PathAndQuery();
+            Assert.Equal("/awesome/v1?awesome=cool", url);
+            url = new UriBuilder().WithPathSegment("/awesome/v1").PathAndQuery();
+            Assert.Equal("/awesome/v1", url);
         }
 
         [Fact]
@@ -41,7 +62,7 @@ namespace FluentUriBuilder.Tests
         {
             var url = new UriBuilder("http://awesome.com")
                     .WithParameter("awesome", "cool", "dawg");
-            Assert.Equal("http://awesome.com/?awesome=cool,dawg", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome=cool,dawg", url.ToUriString());
         }
 
         [Fact]
@@ -49,7 +70,7 @@ namespace FluentUriBuilder.Tests
         {
             var url = new UriBuilder("http://awesome.com")
                     .WithParameter("awesome", new List<int>() { 1, 2 }.Cast<object>());
-            Assert.Equal("http://awesome.com/?awesome=1,2", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome=1,2", url.ToUriString());
         }
 
         [Fact]
@@ -57,28 +78,68 @@ namespace FluentUriBuilder.Tests
         {
             var url = new UriBuilder("http://awesome.com")
                     .WithParameter("awesome");
-            Assert.Equal("http://awesome.com/?awesome", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome", url.ToUriString());
+        }
+
+        [Fact]
+        public void TestAddFragmentArray()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                .WithFragment("awesome", "cool", "dawg");
+            Assert.Equal("http://awesome.com/#awesome=cool,dawg", url.ToUriString());
+        }
+
+        [Fact]
+        public void TestAddFragmentArrayint()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                    .WithFragment("awesome", new List<int>() { 1, 2 }.Cast<object>());
+            Assert.Equal("http://awesome.com/#awesome=1,2", url.ToUriString());
+        }
+
+        [Fact]
+        public void TestAddFragmentNoValue()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                    .WithFragment("awesome");
+            Assert.Equal("http://awesome.com/#awesome", url.ToUriString());
         }
 
         [Fact]
         public void WithPort()
         {
             var url = new UriBuilder().WithPort(22);
-            Assert.Equal(url.Port, 22);
+            Assert.Equal(22, url.Port);
+        }
+
+        [Fact]
+        public void WithoutDefaultPort()
+        {
+            var url = new UriBuilder("http://awesome.com:80")
+                .WithoutDefaultPort();
+            Assert.Equal("http://awesome.com/", url.ToUriString());
+
+            url = new UriBuilder("http://awesome.com:443")
+                .WithoutDefaultPort();
+            Assert.Equal("http://awesome.com:443/", url.ToUriString());
+
+            url = new UriBuilder("https://awesome.com:443")
+                .WithoutDefaultPort();
+            Assert.Equal("https://awesome.com/", url.ToUriString());
         }
 
         [Fact]
         public void WithHttps()
         {
             var url = new UriBuilder().UseHttps(true);
-            Assert.Equal(url.Scheme, "https");
+            Assert.Equal("https", url.Scheme);
         }
 
         [Fact]
         public void WithHttp()
         {
             var url = new UriBuilder().UseHttps(false);
-            Assert.Equal(url.Scheme, "http");
+            Assert.Equal("http", url.Scheme);
         }
 
         [Fact]
@@ -86,7 +147,7 @@ namespace FluentUriBuilder.Tests
         {
             //the jesus scheme?
             var url = new UriBuilder().WithScheme("jesus");
-            Assert.Equal(url.Scheme, "jesus");
+            Assert.Equal("jesus", url.Scheme);
         }
 
         [Fact]
@@ -94,7 +155,7 @@ namespace FluentUriBuilder.Tests
         {
             //the jesus scheme?
             var url = new UriBuilder().WithHost("yodawg.com");
-            Assert.Equal(url.Host, "yodawg.com");
+            Assert.Equal("yodawg.com", url.Host);
         }
 
         [Fact]
@@ -104,7 +165,7 @@ namespace FluentUriBuilder.Tests
                     .WithParameter("awesome", "yodawg")
                     .WithParameter("fun", null)
                     .WithParameter("cool", string.Empty);
-            Assert.Equal("http://awesome.com/?awesome=yodawg&fun&cool", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome=yodawg&fun&cool", url.ToUriString());
         }
 
         [Fact]
@@ -114,7 +175,64 @@ namespace FluentUriBuilder.Tests
                     .WithParameter("awesome", "yodawg")
                     .WithParameter("supg", "no2")
                     .WithParameter("supgf", "no22");
-            Assert.Equal("http://awesome.com/?awesome=yodawg&supg=no2&supgf=no22", url.Uri.ToString());
+            Assert.Equal("http://awesome.com/?awesome=yodawg&supg=no2&supgf=no22", url.ToUriString());
         }
+
+        [Fact]
+        public void AddDictOfParams()
+        {
+            var dictionary = new Dictionary<string, string>()
+            {
+                ["yo"] = "dawg",
+                ["troll"] = "toll",
+                ["hammer"] = string.Empty
+            };
+            var url = new UriBuilder("http://awesome.com")
+                    .WithParameter(dictionary);
+            Assert.Equal("http://awesome.com/?yo=dawg&troll=toll&hammer", url.ToUriString());
+        }
+
+        [Fact]
+        public void AddFragmentWithNoValue()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                .WithFragment("awesome", "yodawg")
+                .WithFragment("fun", null)
+                .WithFragment("cool", string.Empty);
+            Assert.Equal("http://awesome.com/#awesome=yodawg&fun&cool", url.ToUriString());
+        }
+
+        [Fact]
+        public void TestAddTwoUrlFragments()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                .WithFragment("awesome", "yodawg")
+                .WithFragment("supg", "no2")
+                .WithFragment("supgf", "no22");
+            Assert.Equal("http://awesome.com/#awesome=yodawg&supg=no2&supgf=no22", url.ToUriString());
+        }
+
+        [Fact]
+        public void AddDictOfFragments()
+        {
+            var dictionary = new Dictionary<string, string>()
+            {
+                ["yo"] = "dawg",
+                ["troll"] = "toll",
+                ["hammer"] = string.Empty
+            };
+            var url = new UriBuilder("http://awesome.com")
+                .WithFragment(dictionary);
+            Assert.Equal("http://awesome.com/#yo=dawg&troll=toll&hammer", url.ToUriString());
+        }
+
+        [Fact]
+        public void TestToEscapedString()
+        {
+            var url = new UriBuilder("http://awesome.com")
+                    .WithParameter("yo", "dawg<");
+            Assert.Equal("http://awesome.com/?yo=dawg<", url.ToUriString());
+        }
+
     }
 }

src/UriBuilder.Fluent.UnitTests/Properties/AssemblyInfo.cs

@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f421a9ee-180c-413e-a0cd-665295825646")]

src/UriBuilder.Fluent.UnitTests/ThrowsTests.cs

@@ -13,10 +13,27 @@ namespace FluentUriBuilder.Tests
         {
             var tstObj = new UriBuilder();
             Assert.Throws<ArgumentNullException>(() => tstObj.WithParameter(string.Empty, string.Empty));
+            Assert.Throws<ArgumentNullException>(() => tstObj.WithFragment(string.Empty, string.Empty));
             Assert.Throws<ArgumentNullException>(() => tstObj.WithPathSegment(null));
             Assert.Throws<ArgumentNullException>(() => tstObj.WithScheme(null));
             Assert.Throws<ArgumentNullException>(() => tstObj.WithHost(null));
+            Assert.Throws<ArgumentNullException>(() => tstObj.WithParameter((IEnumerable<KeyValuePair<string, string>>)null));
+            Assert.Throws<ArgumentNullException>(() => tstObj.WithParameter((IEnumerable<(string, string)>)null));
+            Assert.Throws<ArgumentNullException>(() => tstObj.WithFragment(fragmentDictionary: null));
             Assert.Throws<ArgumentOutOfRangeException>(() => tstObj.WithPort(-1));
+            UriBuilder nullPtr = null;
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithFragment("yo", "dawg"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithFragment(new Dictionary<string, string>()));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithParameter("yo", "dawg"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithPathSegment("yo"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithScheme("yo"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithFragment("yo"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithoutDefaultPort());
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithoutDefaultPort());
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithPort(1));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithHost("yo"));
+            Assert.Throws<ArgumentNullException>(() => nullPtr.UseHttps());
+            Assert.Throws<ArgumentNullException>(() => nullPtr.WithParameter((IEnumerable<(string, string)>)null));
         }
     }
 }

src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <CoverletOutputFormat>lcov</CoverletOutputFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\UriBuilder.Fluent\UriBuilder.Fluent.csproj" />
+  </ItemGroup>
+
+</Project>

src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f421a9ee-180c-413e-a0cd-665295825646</ProjectGuid>
-    <RootNamespace>UriBuilder.Fluent.UnitTests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

src/UriBuilder.Fluent.UnitTests/UriBuilder.Fluent.UnitTests.xproj.user

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>Start</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>

src/UriBuilder.Fluent.UnitTests/Usings.cs

@@ -0,0 +1 @@
+global using Xunit;

src/UriBuilder.Fluent.UnitTests/project.json

@@ -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"
-        }
-      }
-    }
-  }
-}

src/UriBuilder.Fluent/Properties/AssemblyInfo.cs

@@ -5,10 +5,6 @@ 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

src/UriBuilder.Fluent/TerribleDevUriExtensions.cs

@@ -1,52 +1,189 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Data.SqlTypes;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace System
 {
-    public static class TerribleDevUriExtensions
+    public static partial class TerribleDevUriExtensions
     {
+        /// <summary>
+        /// Appends a query string parameter with a key, and many values. Multiple values will be comma seperated. If only 1 value is passed and its null or value, the key will be added to the QS.
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="key"></param>
+        /// <param name="values"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
         public static UriBuilder WithParameter(this UriBuilder bld, string key, params string[] values) => bld.WithParameter(key, valuesEnum: values);
 
-        public static UriBuilder WithParameter(this UriBuilder bld, string key, IEnumerable<object> valuesEnum)
+        /// <summary>
+        /// Appends query strings from a list of key-value pairs (usually a dictionary).
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="parameterDictionary"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithParameter(this UriBuilder bld, IEnumerable<KeyValuePair<string, string>> parameterDictionary)
         {
-            if(string.IsNullOrWhiteSpace(key))
+            if (bld == null)
             {
-                throw new ArgumentNullException(nameof(key));
+                throw new ArgumentNullException(nameof(bld));
             }
-            if(valuesEnum == null)
+            if (parameterDictionary == null)
             {
-                valuesEnum = new string[0];
+                throw new ArgumentNullException(nameof(parameterDictionary));
             }
-            var isfirst = string.IsNullOrWhiteSpace(bld.Query);
+            foreach (var item in parameterDictionary)
-            var intitialValue = isfirst ? "" : $"{bld.Query.TrimStart('?')}&";
-            var sb = new StringBuilder($"{intitialValue}{key}");
-            var validValueHit = false;
-            foreach(var value in valuesEnum)
             {
-                var toSValue = value?.ToString();
+                bld.WithParameter(item.Key, item.Value);
-                if(string.IsNullOrWhiteSpace(toSValue)) continue;
-                // we can't just have an = sign since its valid to have query string paramters with no value;
-                if(!validValueHit) toSValue = "=" + value;
-                validValueHit = true;
-                sb.Append($"{toSValue},");
             }
-            bld.Query = sb.ToString().TrimEnd(',');
             return bld;
         }
 
+        /// <summary>
+        /// Appends a query string parameter with a key, and many values. Multiple values will be comma seperated. If only 1 value is passed and its null or value, the key will be added to the QS.
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="key"></param>
+        /// <param name="valuesEnum"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithParameter(this UriBuilder bld, string key, IEnumerable<object> valuesEnum)
+        {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+            if (valuesEnum == null)
+            {
+                valuesEnum = new string[0];
+            }
+            var intitialValue = string.IsNullOrWhiteSpace(bld.Query) ? "" : $"{bld.Query.TrimStart('?')}&";
+            bld.Query = intitialValue.AppendKeyValue(key, valuesEnum);
+            return bld;
+        }
+
+        /// <summary>
+        /// Appends a fragments parameter with a key, and many values. Multiple values will be comma seperated. If only 1 value is passed and its null or value, the key will be added to the fragment.
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="key"></param>
+        /// <param name="values"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithFragment(this UriBuilder bld, string key, params string[] values) => bld.WithFragment(key, valuesEnum: values);
+
+        /// <summary>
+        /// Appends fragments from dictionary
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="fragmentDictionary"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithFragment(this UriBuilder bld, IDictionary<string, string> fragmentDictionary)
+        {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (fragmentDictionary == null)
+            {
+                throw new ArgumentNullException(nameof(fragmentDictionary));
+            }
+            foreach (var item in fragmentDictionary)
+            {
+                bld.WithFragment(item.Key, item.Value);
+            }
+            return bld;
+        }
+
+        /// <summary>
+        /// Appends a fragments with a key, and many values. Multiple values will be comma seperated. If only 1 value is passed and its null or value, the key will be added to the fragment.
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="key"></param>
+        /// <param name="valuesEnum"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithFragment(this UriBuilder bld, string key, IEnumerable<object> valuesEnum)
+        {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+            if (valuesEnum == null)
+            {
+                valuesEnum = new string[0];
+            }
+            var intitialValue = string.IsNullOrWhiteSpace(bld.Fragment) ? "" : $"{bld.Fragment.TrimStart('#')}&";
+            bld.Fragment = intitialValue.AppendKeyValue(key, valuesEnum);
+            return bld;
+        }
+
+        /// <summary>
+        /// Sets the port to be the port number
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="port"></param>
+        /// <exception cref="ArgumentOutOfRangeException">Throws if port is less than one</exception>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
         public static UriBuilder WithPort(this UriBuilder bld, int port)
         {
-            if(port < 1) throw new ArgumentOutOfRangeException(nameof(port));
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (port < 1)
+            {
+                throw new ArgumentOutOfRangeException(nameof(port));
+            }
             bld.Port = port;
             return bld;
         }
 
+        /// <summary>
+        /// Removes the port number for default ports
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <returns></returns>
+        public static UriBuilder WithoutDefaultPort(this UriBuilder bld)
+        {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (bld.Uri.IsDefaultPort)
+            {
+                bld.Port = -1;
+            }
+            return bld;
+        }
+
+        /// <summary>
+        /// appends a path segment to the path. Can be called multiple times to append multiple segments
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="pathSegment"></param>
+        /// <exception cref="ArgumentNullException">You pass a string as a path segment</exception>
+        /// <returns></returns>
         public static UriBuilder WithPathSegment(this UriBuilder bld, string pathSegment)
         {
-            if(string.IsNullOrWhiteSpace(pathSegment))
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (string.IsNullOrWhiteSpace(pathSegment))
             {
                 throw new ArgumentNullException(nameof(pathSegment));
             }
@@ -55,24 +192,115 @@ namespace System
             return bld;
         }
 
+        /// <summary>
+        /// Sets your Uri Scheme
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="scheme"></param>
+        /// <exception cref="ArgumentNullException">You must pass a scheme</exception>
+        /// <returns></returns>
         public static UriBuilder WithScheme(this UriBuilder bld, string scheme)
         {
-            if(string.IsNullOrWhiteSpace(scheme)) throw new ArgumentNullException(nameof(scheme));
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (string.IsNullOrWhiteSpace(scheme))
+            {
+                throw new ArgumentNullException(nameof(scheme));
+            }
             bld.Scheme = scheme;
             return bld;
         }
 
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="host"></param>
+        /// <exception cref="ArgumentNullException">You must pass a ho0st</exception>
+        /// <returns></returns>
         public static UriBuilder WithHost(this UriBuilder bld, string host)
         {
-            if(string.IsNullOrWhiteSpace(host)) throw new ArgumentNullException(nameof(host));
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (string.IsNullOrWhiteSpace(host))
+            {
+                throw new ArgumentNullException(nameof(host));
+            }
             bld.Host = host;
             return bld;
         }
 
+        public static string PathAndQuery(this UriBuilder bld) => (bld.Path + bld.Query);
+
+        /// <summary>
+        /// Use Https?
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="predicate">default true, if false sets scheme to http</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
         public static UriBuilder UseHttps(this UriBuilder bld, bool predicate = true)
         {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
             bld.Scheme = predicate ? "https" : "http";
             return bld;
         }
+
+        /// <summary>
+        /// Escape Url query string
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static string ToEscapeString(this UriBuilder bld) => Uri.EscapeUriString(bld.Uri.ToString());
+
+        /// <summary>
+        /// Escape the whole Url string
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static string ToEscapeDataString(this UriBuilder bld) => Uri.EscapeDataString(bld.Uri.ToString());
+
+        /// <summary>
+        /// Returns the Uri string
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static string ToUriString(this UriBuilder bld) => bld.Uri.ToString();
+
+        /// <summary>
+        /// Appends x-www-form-urlencoded key and valuesEnum into initialValue.
+        /// </summary>
+        /// <exception cref="ArgumentNullException"></exception>
+        private static string AppendKeyValue(this string intitialValue, string key, IEnumerable<object> valuesEnum)
+        {
+            var encodedKey = Uri.EscapeDataString(key);
+
+            var sb = new StringBuilder($"{intitialValue}{encodedKey}");
+
+            var Values = (
+                from x in valuesEnum
+                let v = x?.ToString()
+                where !string.IsNullOrWhiteSpace(v)
+                select Uri.EscapeDataString(v)
+                ).ToArray();
+
+            if (Values.Length > 0)
+            {
+                sb.Append("=");
+                sb.Append(string.Join(",", Values));
+            }
+
+            return sb.ToString();
+        }
     }
 }

src/UriBuilder.Fluent/TerribleDevUriExtensionsTuple.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace System
+{
+    public static partial class TerribleDevUriExtensions
+    {
+        /// <summary>
+        /// Appends query strings from dictionary
+        /// </summary>
+        /// <param name="bld"></param>
+        /// <param name="parameterDictionary"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static UriBuilder WithParameter(this UriBuilder bld, IEnumerable<(string, string)> parameterDictionary)
+        {
+            if (bld == null)
+            {
+                throw new ArgumentNullException(nameof(bld));
+            }
+            if (parameterDictionary == null) throw new ArgumentNullException(nameof(parameterDictionary));
+            foreach (var item in parameterDictionary)
+            {
+                bld.WithParameter(item.Item1, item.Item2);
+            }
+            return bld;
+        }
+    }
+}

src/UriBuilder.Fluent/UriBuilder.Fluent.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Authors>Tommy Parnell</Authors>
+    <AssemblyName>UriBuilder.Fluent</AssemblyName>
+    <PackageId>UriBuilder.Fluent</PackageId>
+    <PackageTags>Url building;Uri;Uri building;fluent;extension</PackageTags>
+    <PackageProjectUrl>https://github.com/TerribleDev/UriBuilder.Fluent</PackageProjectUrl>
+
+	<PackageIcon>UriBulider.Fluent.png</PackageIcon>
+	<PackageIconUrl />
+	<TargetFramework>netstandard2.0</TargetFramework>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+	<PackageReleaseNotes>
+		This package adds extension methods over System.UriBuilder to help deal with query string parameters and create more of a fluent interface. 
+		Unlike other projects, this NetStandardLibrary compliant package builds ontop of trusty UriBuilder, does not use custom Uri generators, and has no outside dependencies!
+	</PackageReleaseNotes>
+  </PropertyGroup>
+
+
+	<ItemGroup>
+		<None Include="..\..\Readme.md" Pack="true" PackagePath="\" />
+		<None Include="..\..\UriBulider.Fluent.png" Pack="true" PackagePath="\" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+	</ItemGroup>
+
+	
+</Project>

src/UriBuilder.Fluent/UriBuilder.Fluent.xproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b8458f59-debd-4844-aa29-ee3b4388aa7a</ProjectGuid>
-    <RootNamespace>UriBuilder.Fluent</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

src/UriBuilder.Fluent/UriBuilder.Fluent.xproj.user

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>Start</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>

src/UriBuilder.Fluent/project.json

@@ -1,28 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "packOptions": {
-      "owners": [
-          "Tommy Parnell"
-      ],
-      "projectUrl": "https://github.com/tparnell8/TurboLinks.Net",
-      "summary": "Fluent extensions for UriBuilder",
-      "tags": [
-          "Url building",
-          "Uri",
-          "Uri building",
-          "fluent",
-          "extension"
-      ]
-  },
-  "dependencies": {
-    "NETStandard.Library": "1.6.0"
-  },
-  "authors": [
-      "Tommy Parnell"
-  ],
-  "frameworks": {
-    "netstandard1.1": {
-      "imports": "dnxcore50"
-    }
-  }
-}

update-projectjson.ps1

@@ -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