Permalink
Browse files

Updated solution to VS2010

Updated to psake 4.00
Added build script for .NET 4
  • Loading branch information...
CoreyKaylor committed Jun 3, 2010
1 parent b6f8aa2 commit e71c1c63248a71339f98ba182bf6553d42ca1856
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,8 @@
<AssemblyName>Rhino.ServiceBus.Host</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\ayende-open-source.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,8 @@
<AssemblyName>Rhino.ServiceBus.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\ayende-open-source.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
@@ -1,12 +1,12 @@

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starbucks", "Starbucks", "{64DC50EF-F634-4E75-8375-ACC6D42E2DB4}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rhino.ServiceBus", "Rhino.ServiceBus\Rhino.ServiceBus.csproj", "{1B21C8A5-5E0E-412B-A7F4-9F28B4427F21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rhino.ServiceBus.Tests", "Rhino.ServiceBus.Tests\Rhino.ServiceBus.Tests.csproj", "{EAC59871-8B6B-4A1B-A2AE-69F7194F047E}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starbucks", "Starbucks", "{64DC50EF-F634-4E75-8375-ACC6D42E2DB4}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Starbucks", "Samples\Starbucks\Starbucks.csproj", "{0FC43226-8030-46FC-A2AB-D064207FF364}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rhino.ServiceBus.Host", "Rhino.ServiceBus.Host\Rhino.ServiceBus.Host.csproj", "{8FBBDD2A-A832-4827-9325-C670B6DC06FB}"
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,8 @@
<AssemblyName>Rhino.ServiceBus</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\ayende-open-source.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -18,4 +18,8 @@
</transforms>
</xunit>
+ <startup>
+ <requiredRuntime version="v4.0.30319" safemode="true"/>
+ </startup>
+
</configuration>
View
@@ -0,0 +1,3 @@
+import-module .\psake.psm1
+invoke-psake -framework '4.0' .\default.ps1 -properties @{config='Release';target_framework_version='4.0'}
+remove-module psake
View
@@ -7,7 +7,11 @@ properties {
$version = "1.8.0.0"
$tools_dir = "$base_dir\Tools"
$release_dir = "$base_dir\Release"
-}
+ $config = "Debug"
+ $target_framework_version = "3.5"
+}
+
+$framework = '4.0'
include .\psake_ext.ps1
@@ -39,15 +43,6 @@ task Init -depends Clean {
Generate-Assembly-Info `
-file "$base_dir\Rhino.ServiceBus.Host\Properties\AssemblyInfo.cs" `
- -title "Rhino DistributedHashTable $version" `
- -description "Distributed Hash Table for .NET" `
- -company "Hibernating Rhinos" `
- -product "Rhino DHT $version" `
- -version $version `
- -copyright "Hibernating Rhinos & Ayende Rahien 2004 - 2009"
-
- Generate-Assembly-Info `
- -file "$base_dir\Rhino.ServiceBus.DistributedHashTableIntegration\Properties\AssemblyInfo.cs" `
-title "Rhino Service Bus $version" `
-description "Developer friendly service bus for .NET" `
-company "Hibernating Rhinos" `
@@ -59,14 +54,19 @@ task Init -depends Clean {
new-item $buildartifacts_dir -itemType directory
}
-task Compile -depends Init {
- exec msbuild "/p:OutDir=""$buildartifacts_dir "" $sln_file"
+task Compile -depends Init {
+ $build_properties = "OutDir=$buildartifacts_dir;Configuration=$config"
+ if($target_framework_version -eq '4.0')
+ {
+ $build_properties = "$build_properties;TargetFrameworkVersion=$target_framework_version"
+ }
+ msbuild $sln_file /p:$build_properties
}
task Test -depends Compile {
$old = pwd
cd $build_dir
- exec "$tools_dir\xUnit\xunit.console.exe" "$build_dir\Rhino.ServiceBus.Tests.dll"
+ & $tools_dir\xUnit\xunit.console.exe "$build_dir\Rhino.ServiceBus.Tests.dll"
cd $old
}
Oops, something went wrong.

0 comments on commit e71c1c6

Please sign in to comment.