Target .NET 4.5 (instead of 4.5.1)

Create new NuGet package targeting both framework 4.0 and 4.5
samcook · Apr 21, 2015 · af0cf23 · af0cf23
1 parent 98bc13d
commit af0cf23
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 32 deletions.
diff --git a/RedLock.Logging.Log4Net/RedLock.Logging.Log4Net.csproj b/RedLock.Logging.Log4Net/RedLock.Logging.Log4Net.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedLock.Logging.Log4Net</RootNamespace>
     <AssemblyName>RedLock.Logging.Log4Net</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/RedLock.Logging.Log4Net/packages.config b/RedLock.Logging.Log4Net/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net451" />
+  <package id="log4net" version="2.0.3" targetFramework="net45" />
 </packages>
diff --git a/RedLock.Tests/App.config b/RedLock.Tests/App.config
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<configSections>
-		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-	</configSections>
-	<log4net>
-		<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-			<layout type="log4net.Layout.PatternLayout">
-				<param name="Header" value="[Header]\r\n" />
-				<param name="Footer" value="[Footer]\r\n" />
-				<param name="ConversionPattern" value="%d [%t] %-5p %c %m%n" />
-			</layout>
-		</appender>
-		<root>
-			<level value="DEBUG" />
-			<appender-ref ref="ConsoleAppender" />
-		</root>
-	</log4net>
-</configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+  </configSections>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <param name="Header" value="[Header]\r\n"/>
+        <param name="Footer" value="[Footer]\r\n"/>
+        <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n"/>
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG"/>
+      <appender-ref ref="ConsoleAppender"/>
+    </root>
+  </log4net>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+  </startup>
+</configuration>
diff --git a/RedLock.Tests/RedLock.Tests.csproj b/RedLock.Tests/RedLock.Tests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedLock.Tests</RootNamespace>
     <AssemblyName>RedLock.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/RedLock.Tests/packages.config b/RedLock.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net451" />
-  <package id="NUnit" version="2.6.3" targetFramework="net451" />
-  <package id="StackExchange.Redis" version="1.0.328" targetFramework="net451" />
+  <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="StackExchange.Redis" version="1.0.328" targetFramework="net45" />
 </packages>
diff --git a/RedLock.net.sln b/RedLock.net.sln
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE = LICENSE
 		README.md = README.md
 		redlock-icon.png = redlock-icon.png
+		RedLock.nuspec = RedLock.nuspec
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedLock.Tests", "RedLock.Tests\RedLock.Tests.csproj", "{2DF8C6CF-482F-4C51-9BA0-1F7814CA91E0}"

diff --git a/RedLock/RedLock.nuspec → RedLock.nuspec b/RedLock/RedLock.nuspec → RedLock.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>RedLock.net</id>
-    <version>$version$</version>
+    <version>1.1.0</version>
     <title>RedLock.net</title>
     <authors>Sam Cook</authors>
     <owners>Sam Cook</owners>
@@ -11,8 +11,18 @@
     <iconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An implementation of the Redlock distributed lock algorithm</description>
-    <releaseNotes>1.0.0 - Initial release</releaseNotes>
+    <releaseNotes>
+1.1.0 - Target .NET 4.0 and 4.5
+1.0.0 - Initial release
+    </releaseNotes>
     <copyright>Copyright 2014 Sam Cook</copyright>
     <tags>RedLock Redis Distributed Lock</tags>
+    <dependencies>
+      <dependency id="StackExchange.Redis" version="1.0.328"/>
+    </dependencies>
   </metadata>
+  <files>
+    <file src="RedLock\bin\Release\RedLock.dll" target="lib\net45" />
+    <file src="RedLock_Net40\bin\Release\RedLock.dll" target="lib\net40" />
+  </files>
 </package>
diff --git a/RedLock/Properties/AssemblyInfo.cs b/RedLock/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 
 [assembly: InternalsVisibleTo("RedLock.Tests")]
diff --git a/RedLock/RedLock.csproj b/RedLock/RedLock.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedLock</RootNamespace>
     <AssemblyName>RedLock</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,7 +53,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="RedLock.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. 

diff --git a/RedLock/packages.config b/RedLock/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="StackExchange.Redis" version="1.0.328" targetFramework="net451" />
+  <package id="StackExchange.Redis" version="1.0.328" targetFramework="net45" />
 </packages>