Merge pull request #4 from AndreyTsvetkov/3

3
AndreyTsvetkov · Sep 21, 2016 · aa70794 · aa70794
2 parents 5220321 + b8e6203
commit aa70794
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 2 deletions.
diff --git a/src/TS.FastNugetUpdate.Tests/NugetUpdateTests.cs b/src/TS.FastNugetUpdate.Tests/NugetUpdateTests.cs
@@ -21,6 +21,20 @@ public void Apply_ChangesVersionToCorrect()
 			Assert.IsTrue(File.ReadAllText(packagesFile).Contains("1.3.1.7"));
 		}
 
+		[TestMethod]
+		public void Apply_ChangesBetaVersionToCorrect()
+		{
+			var fileRoot = Environment.CurrentDirectory;
+
+			var sut = new NugetUpdate("Functional.Maybe", "1.0.8", Console.Out.WriteLine, Console.Error.WriteLine);
+
+			Assert.IsTrue(sut.Apply(fileRoot));
+			var projectFile = Path.Combine(fileRoot, "demo-with-beta", "demo-with-beta.csproj");
+			var packagesFile = Path.Combine(fileRoot, "demo-with-beta", "packages.config");
+			Assert.IsTrue(File.ReadAllText(projectFile).Contains("1.0.8"));
+			Assert.IsTrue(File.ReadAllText(packagesFile).Contains("1.0.8"));
+		}
+
 
 		[TestMethod]
 		public void Apply_RemainsLinesNumberTheSame()

diff --git a/src/TS.FastNugetUpdate.Tests/TS.FastNugetUpdate.Tests.csproj b/src/TS.FastNugetUpdate.Tests/TS.FastNugetUpdate.Tests.csproj
@@ -65,9 +65,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="demo-with-beta\packages.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="demo\packages.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Content Include="demo-with-beta\demo-with-beta.csproj">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="packages\Functional.Maybe.1.0.8\lib\portable-net40+win+MonoAndroid10+xamarinios10+MonoTouch10\Functional.Maybe.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/src/TS.FastNugetUpdate.Tests/demo-with-beta/demo-with-beta.csproj b/src/TS.FastNugetUpdate.Tests/demo-with-beta/demo-with-beta.csproj
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Reference Include="Functional.Maybe, Version=1.0.3.0">
+      <HintPath>..\packages\Functional.Maybe.1.0.6-beta\lib\portable-net40+win+MonoAndroid10+xamarinios10+MonoTouch10\Functional.Maybe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+</Project>
diff --git a/src/TS.FastNugetUpdate.Tests/demo-with-beta/packages.config b/src/TS.FastNugetUpdate.Tests/demo-with-beta/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+	<package id="Functional.Maybe" version="1.0.6-beta" />
+</packages>
diff --git a/src/TS.FastNugetUpdate/NugetUpdate.cs b/src/TS.FastNugetUpdate/NugetUpdate.cs
@@ -78,7 +78,7 @@ private static Func<string, string> FixAssemblyReference(string name, string pac
 			var reference = new Regex(
 				$@"<Reference Include=""{RegexEncode(name)}, Version=[^""]+"">");
 			var hintPath = new Regex(
-				$@"<HintPath>(?<packageRoot>[\.\w\\]*?packages)\\{RegexEncode(name)}\.\d+\.\d+\.\d+(\.\d+)?\\(?<restPath>[^<]+)</HintPath>");
+				$@"<HintPath>(?<packageRoot>[\.\w\\]*?packages)\\{RegexEncode(name)}\..*?\\(?<restPath>[^<]+)</HintPath>");
 
 			return content =>
 			{

diff --git a/src/TS.FastNugetUpdate/Properties/AssemblyInfo.cs b/src/TS.FastNugetUpdate/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("c74b89d7-2d95-4b05-96a9-2b39ff5569d6")]
 
-[assembly: AssemblyVersion("0.0.1")]
+[assembly: AssemblyVersion("0.1.0")]