Cleanup nuget creation

Updated nugets used in the solution
fluentscheduler · May 24, 2013 · faa1a1c · faa1a1c
1 parent f51ef60
commit faa1a1c
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 96 deletions.
diff --git a/FluentScheduler.Tests/FluentScheduler.Tests.csproj b/FluentScheduler.Tests/FluentScheduler.Tests.csproj
@@ -37,9 +37,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.1.12217, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="Should">
       <HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>

diff --git a/FluentScheduler.Tests/packages.config b/FluentScheduler.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="NUnit" version="2.6.1" targetFramework="net40" />
+  <package id="NUnit" version="2.6.2" targetFramework="net40" />
   <package id="Should" version="1.1.12.0" />
   <package id="ShouldFluent" version="1.1.12.0" />
 </packages>
diff --git a/...r.Webtester/App_Start/AttributeRouting.cs → ...ester/App_Start/AttributeRoutingConfig.cs b/...r.Webtester/App_Start/AttributeRouting.cs → ...ester/App_Start/AttributeRoutingConfig.cs
@@ -1,19 +1,22 @@
 using System.Web.Routing;
 using AttributeRouting.Web.Mvc;
 
-[assembly: WebActivator.PreApplicationStartMethod(typeof(FluentScheduler.Webtester.App_Start.AttributeRouting), "Start")]
+[assembly: WebActivator.PreApplicationStartMethod(typeof(FluentScheduler.Webtester.AttributeRoutingConfig), "Start")]
 
-namespace FluentScheduler.Webtester.App_Start {
-    public static class AttributeRouting {
-		public static void RegisterRoutes(RouteCollection routes) {
-
+namespace FluentScheduler.Webtester 
+{
+    public static class AttributeRoutingConfig
+	{
+		public static void RegisterRoutes(RouteCollection routes) 
+		{    
 			// See https://github.com/mccalltd/AttributeRouting/wiki for more options.
 			// To debug routes locally using the built in ASP.NET development server, go to /routes.axd
 
 			routes.MapAttributeRoutes();
 		}
 
-        public static void Start() {
+        public static void Start() 
+		{
             RegisterRoutes(RouteTable.Routes);
         }
     }

diff --git a/FluentScheduler.Webtester/FluentScheduler.Webtester.csproj b/FluentScheduler.Webtester/FluentScheduler.Webtester.csproj
@@ -41,30 +41,37 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AttributeRouting">
-      <HintPath>..\packages\AttributeRouting.Core.3.2\lib\net40\AttributeRouting.dll</HintPath>
+    <Reference Include="AttributeRouting, Version=3.5.6.0, Culture=neutral, PublicKeyToken=c10f85d521a011a9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\AttributeRouting.Core.3.5.6\lib\net40\AttributeRouting.dll</HintPath>
     </Reference>
-    <Reference Include="AttributeRouting.Web">
-      <HintPath>..\packages\AttributeRouting.Core.Web.3.2\lib\net40\AttributeRouting.Web.dll</HintPath>
+    <Reference Include="AttributeRouting.Web, Version=3.5.6.0, Culture=neutral, PublicKeyToken=c10f85d521a011a9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\AttributeRouting.Core.Web.3.5.6\lib\net40\AttributeRouting.Web.dll</HintPath>
     </Reference>
-    <Reference Include="AttributeRouting.Web.Mvc">
-      <HintPath>..\packages\AttributeRouting.3.2\lib\net40\AttributeRouting.Web.Mvc.dll</HintPath>
+    <Reference Include="AttributeRouting.Web.Mvc, Version=3.5.6.0, Culture=neutral, PublicKeyToken=c10f85d521a011a9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\AttributeRouting.3.5.6\lib\net40\AttributeRouting.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="ServiceStack.Common">
-      <HintPath>..\packages\ServiceStack.Common.3.9.28\lib\net35\ServiceStack.Common.dll</HintPath>
+    <Reference Include="ServiceStack.Common, Version=3.9.46.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.46\lib\net35\ServiceStack.Common.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\packages\ServiceStack.Common.3.9.28\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    <Reference Include="ServiceStack.Interfaces, Version=3.9.46.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.46\lib\net35\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Logging.Log4Net">
-      <HintPath>..\packages\ServiceStack.Logging.Log4Net.1.0.4.0\lib\net35\ServiceStack.Logging.Log4Net.dll</HintPath>
+    <Reference Include="ServiceStack.Logging.Log4Net, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Logging.Log4Net.1.0.9.0\lib\net35\ServiceStack.Logging.Log4Net.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.29\lib\net35\ServiceStack.Text.dll</HintPath>
+    <Reference Include="ServiceStack.Text, Version=3.9.45.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.46\lib\net35\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -121,7 +128,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Start\AttributeRouting.cs" />
+    <Compile Include="App_Start\AttributeRoutingConfig.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>

diff --git a/FluentScheduler.Webtester/Web.config b/FluentScheduler.Webtester/Web.config
@@ -24,22 +24,22 @@
 				<add namespace="System.Web.WebPages" />
 			</namespaces>
 		</pages>
-		<httpHandlers>
-			<add verb="*" path="routes.axd" type="AttributeRouting.Web.Logging.LogRoutesHandler, AttributeRouting.Web" />
-		</httpHandlers>
-	</system.web>
+
+	<httpHandlers><add verb="*" path="routes.axd" type="AttributeRouting.Web.Logging.LogRoutesHandler, AttributeRouting.Web" /></httpHandlers></system.web>
 	<system.webServer>
 		<validation validateIntegratedModeConfiguration="false" />
-		<handlers>
-			<add name="AttributeRouting" path="routes.axd" verb="*" type="AttributeRouting.Web.Logging.LogRoutesHandler, AttributeRouting.Web" />
-		</handlers>
-	</system.webServer>
+
+	<handlers><add name="AttributeRouting" path="routes.axd" verb="*" type="AttributeRouting.Web.Logging.LogRoutesHandler, AttributeRouting.Web" /></handlers></system.webServer>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
 			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
 </configuration>
diff --git a/FluentScheduler.Webtester/packages.config b/FluentScheduler.Webtester/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AttributeRouting" version="3.2" targetFramework="net45" />
-  <package id="AttributeRouting.Core" version="3.2" targetFramework="net45" />
-  <package id="AttributeRouting.Core.Web" version="3.2" targetFramework="net45" />
+  <package id="AttributeRouting" version="3.5.6" targetFramework="net45" />
+  <package id="AttributeRouting.Core" version="3.5.6" targetFramework="net45" />
+  <package id="AttributeRouting.Core.Web" version="3.5.6" targetFramework="net45" />
   <package id="log4net" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.28" targetFramework="net45" />
-  <package id="ServiceStack.Logging.Log4Net" version="1.0.4.0" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.29" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.46" targetFramework="net45" />
+  <package id="ServiceStack.Logging.Log4Net" version="1.0.9.0" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.46" targetFramework="net45" />
   <package id="WebActivator" version="1.0.0.0" targetFramework="net45" />
 </packages>
diff --git a/FluentScheduler.sln b/FluentScheduler.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{84DE7963-A70D-4768-ADDC-0B54E78CA064}"
 	ProjectSection(SolutionItems) = preProject
-		default.msbuild = default.msbuild
+		default.build = default.build
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C7E74B75-9A73-40BB-9919-9560520E176B}"

diff --git a/FluentScheduler/FluentScheduler.csproj b/FluentScheduler/FluentScheduler.csproj
@@ -65,9 +65,6 @@
     <Compile Include="Model\Schedule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NuGet\package.nuspec" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/FluentScheduler/NuGet/package.nuspec → FluentScheduler/package.nuspec b/FluentScheduler/NuGet/package.nuspec → FluentScheduler/package.nuspec
@@ -13,7 +13,7 @@
 		<tags>Library task-scheduler tasks cron</tags>
 	</metadata>
 	<files>
-		<file src="FluentScheduler\bin\Release\FluentScheduler.dll" target="lib" />
-		<file src="FluentScheduler\bin\Release\FluentScheduler.pdb" target="lib" />
+		<file src="bin\Release\FluentScheduler.dll" target="lib\net40" />
+		<file src="bin\Release\FluentScheduler.pdb" target="lib\net40" />
 	</files>
 </package>
diff --git a/default.build b/default.build
@@ -0,0 +1,21 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Default">
+	<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
+
+	<PropertyGroup>
+		<build_number Condition="'$(teamcity_version)' == ''">1.0.0</build_number>
+	</PropertyGroup>
+
+	<Target Name="UpdateVersion">
+		<ItemGroup>
+			<AssemblyInfoFiles Include="**\AssemblyInfo.cs" />
+			<NuspecFiles Include="**\package.nuspec" />
+		</ItemGroup>
+
+		<Message Text="Updating assembly versions: @(AssemblyInfoFiles->'%(RecursiveDir)%(Filename)%(Extension)')"/>
+
+		<FileUpdate Files="@(AssemblyInfoFiles->'%(RecursiveDir)%(Filename)%(Extension)')" Regex="AssemblyVersion\(&quot;([^&quot;]*)&quot;\)" ReplacementText="AssemblyVersion(&quot;$(build_number)&quot;)" />
+		<FileUpdate Files="@(AssemblyInfoFiles->'%(RecursiveDir)%(Filename)%(Extension)')" Regex="AssemblyFileVersion\(&quot;([^&quot;]*)&quot;\)" ReplacementText="AssemblyFileVersion(&quot;$(build_number)&quot;)" />
+		<FileUpdate Files="@(NuspecFiles->'%(RecursiveDir)%(Filename)%(Extension)')" Regex="version&gt;([^&quot;&lt;]*)&lt;/version" ReplacementText="version&gt;$(build_number)&lt;/version" />
+	</Target>
+
+</Project>
diff --git a/default.msbuild b/default.msbuild