update tests add github actions

.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,70 @@
+name: Publish
+on:
+  push:
+    branches:
+      - master
+jobs:
+  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
+  test:
+    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: main
+    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
+    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.
@@ -243,3 +244,8 @@ ModelManifest.xml
 
 # FAKE - F# Make
 .fake/
+.idea
+coverage.opencover.xml
+coverage.json
+coverage.info
+output

.vscode/settings.json

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

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

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

UriBuilder.Fluent.sln

@@ -1,40 +1,34 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 17
-VisualStudioVersion = 15.0.26430.14
+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
-		Readme.md = Readme.md
-	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UriBuilder.Fluent", "src\UriBuilder.Fluent\UriBuilder.Fluent.csproj", "{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("{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
 		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,28 +0,0 @@
-image: Visual Studio 2022
-configuration: Release
-version: 7.0.{build}
-artifacts:
-- path: output\**.nupkg
-  
-init:
-  - git config --global core.autocrlf true
-
-build_script:
-- ps: >-
-    dotnet restore UriBuilder.Fluent.sln --source https://api.nuget.org/v3/index.json
-        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
-        }
-
-
-test_script:
-- ps: dotnet test -c Release .\src\UriBuilder.Fluent.UnitTests\UriBuilder.Fluent.UnitTests.csproj
-
-deploy:
-- provider: NuGet
-  api_key:
-    secure: //tKHlb2yqAtpxnR6p9IAtXwQNaq8UYYyIFSD0QVF3XnEasIxG2gTWdmWuG87fUX
-  on:
-    appveyor_repo_tag: true

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}

src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs

@@ -99,7 +99,7 @@ namespace FluentUriBuilder.Tests
         public void WithPort()
         {
             var url = new UriBuilder().WithPort(22);
-            Assert.Equal(url.Port, 22);
+            Assert.Equal(22, url.Port);
         }
 
         [Fact]
@@ -122,14 +122,14 @@ namespace FluentUriBuilder.Tests
         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]
@@ -137,7 +137,7 @@ namespace FluentUriBuilder.Tests
         {
             //the jesus scheme?
             var url = new UriBuilder().WithScheme("jesus");
-            Assert.Equal(url.Scheme, "jesus");
+            Assert.Equal("jesus", url.Scheme);
         }
 
         [Fact]
@@ -145,7 +145,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]

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

@@ -1,16 +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.
-
-
-// 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

@@ -22,11 +22,16 @@ namespace FluentUriBuilder.Tests
             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());
         }
     }
 }

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

@@ -1,13 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-	<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <CoverletOutputFormat>lcov</CoverletOutputFormat>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
-    <PackageReference Include="xunit" Version="2.2.0" />
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+      <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/Usings.cs

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

src/UriBuilder.Fluent/TerribleDevUriExtensions.cs

@@ -1,12 +1,9 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace System
 {
-    public static partial class TerribleDevUriExtensions
+    public static 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.
@@ -14,10 +11,10 @@ namespace System
         /// <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);
 
-
         /// <summary>
         /// Appends query strings from a list of key-value pairs (usually a dictionary).
         /// </summary>
@@ -48,6 +45,7 @@ namespace System
         /// <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)
         {
@@ -74,6 +72,7 @@ namespace System
         /// <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);
 
@@ -107,6 +106,7 @@ namespace System
         /// <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)
         {
@@ -133,6 +133,7 @@ namespace System
         /// <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)
         {
@@ -237,6 +238,7 @@ namespace System
         /// </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)
         {
@@ -252,6 +254,7 @@ namespace System
         /// 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());
 
@@ -259,12 +262,14 @@ namespace System
         /// 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>
         /// 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 sb = new StringBuilder($"{intitialValue}{key}");

src/UriBuilder.Fluent/TerribleDevUriExtensions_NetCore.cs

@@ -1,34 +0,0 @@
-#if NETSTANDARD2_1_OR_GREATER
-
-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;
-        }
-    }
-}
-
-#endif

src/UriBuilder.Fluent/UriBuilder.Fluent.csproj

@@ -2,37 +2,29 @@
 
   <PropertyGroup>
     <Authors>Tommy Parnell</Authors>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <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>
 
-	<AssemblyVersion>7.0.0.0</AssemblyVersion>
-	<FileVersion>7.0.0.0</FileVersion>
-	<Version>7.0.0</Version>
 	<PackageIcon>UriBulider.Fluent.png</PackageIcon>
 	<PackageIconUrl />
-  </PropertyGroup>
+	<TargetFramework>netstandard2.0</TargetFramework>
-
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net480' ">
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Reference Include="System" />
+    <IncludeSymbols>true</IncludeSymbols>
-    <Reference Include="Microsoft.CSharp" />
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </ItemGroup>
-
-	<PropertyGroup>
 	<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>
-		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile />
   </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>