Fix issues with relative url, target net45

Author: kamranayub

AspNet.MVC5.AssetVersioning.Tests/ExtensionsTests.cs

@@ -16,18 +16,18 @@ public class ExtensionsTests
         public void AppendVersion_Should_Append_To_Empty_Url()
         {
 
-            var path = Extensions.AppendVersion("https://foo.com/test.js", "123");
+            var path = Extensions.AppendVersion("/test.js", "123");
 
-            Assert.AreEqual("https://foo.com/test.js?123", path);
+            Assert.AreEqual("/test.js?123", path);
         }
 
         [TestMethod]
         public void AppendVersion_Should_Append_To_Existing_Url()
         {
 
-            var path = Extensions.AppendVersion("https://foo.com/test.js?h=foo", "123");
+            var path = Extensions.AppendVersion("/test.js?h=foo", "123");
 
-            Assert.AreEqual("https://foo.com/test.js?h=foo&123", path);
+            Assert.AreEqual("/test.js?h=foo&123", path);
         }
 
         [TestMethod]

src/AspNet.MVC5.AssetVersioning.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AspNet.MVC5.AssetVersioning</RootNamespace>
     <AssemblyName>AspNet.MVC5.AssetVersioning</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/AspNet.MVC5.AssetVersioning.csproj.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AspNet.Mvc.AssetVersioning</id>
-    <version>1.0.527</version>
+    <version>1.1.527</version>
     <authors>kayub</authors>
     <owners>kayub</owners>
     <licenseUrl>https://github.com/kamranayub/aspnetmvc5-asset-versioning</licenseUrl>

src/Extensions.cs

@@ -10,26 +10,29 @@ public static class Extensions
     {
         public static string AppendVersion(string contentUrl, string version)
         {
-            var url = new UriBuilder(contentUrl);
-            if (url.Query != null && url.Query.Length > 1)
-                url.Query = url.Query.Substring(1) + "&" + version;
+            if (contentUrl.Contains("?"))
+            {
+                return contentUrl + "&" + version;
+            }
             else
-                url.Query = version;
-
-            return url.Uri.GetComponents(UriComponents.Scheme | UriComponents.Host | UriComponents.PathAndQuery, UriFormat.Unescaped);
+            {
+                return contentUrl + "?" + version;
+            }
         }
 
-        public static string VersionedContent(this UrlHelper helper, string assetPath)
+        public static string VersionedContent(this UrlHelper helper, string contentPath)
         {
-            var fullPath = helper.RequestContext.HttpContext.Server.MapPath(assetPath);
+            var fullPath = helper.RequestContext.HttpContext.Server.MapPath(contentPath);
             var version = AssetVersionCache.GetOrAddCachedVersion(fullPath, helper.RequestContext.HttpContext.Cache);
 
-            if (version != null) { 
+            if (version != null)
+            {
+                var relativePath = helper.Content(contentPath);
                 // append hash to query string
-                return Extensions.AppendVersion(helper.Content(assetPath), version);
+                return AppendVersion(relativePath, version);
             }
 
-            return helper.Content(assetPath);
+            return helper.Content(contentPath);
         }
     }
 }

src/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
 </packages>