Major refactor

micahlmartin · Aug 7, 2012 · 96650ae · 96650ae
1 parent d88cbdb
commit 96650ae
Show file tree

Hide file tree

Showing 131 changed files with 358 additions and 42,460 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,7 @@ binaries
 release
 Upgradelog*
 _Upgrade*
-TestResult.xml
+TestResult.xml
+*.mdf
+*.ldf
+*.user
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyCompany("Micah Martin")]
+[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: ComVisible(false)]		
+
diff --git a/default.ps1 b/default.ps1
@@ -1,4 +1,7 @@
 properties {
+	$ProductVersion = "1.0"
+	$BuildNumber = "0";
+	$PatchVersion = "2"
 	$TargetFramework = "net-4.0"
 	$DownloadDependentPackages = $true
 	$UploadPackage = $false
@@ -10,6 +13,7 @@ $releaseRoot = "$baseDir\Release"
 $releaseDir = "$releaseRoot\net40"
 $buildBase = "$baseDir\build"
 $sourceDir = "$baseDir\src"
+$samplesDir = "$baseDir\samples"
 $outDir =  "$buildBase\output"
 $toolsDir = "$baseDir\tools"
 $binariesDir = "$baseDir\binaries"
@@ -19,9 +23,8 @@ $script:msBuild = ""
 $script:isEnvironmentInitialized = $false
 $script:ilmergeTargetFramework = ""
 $script:msBuildTargetFramework = ""	
-$ilMergeKey = "$srcDir\NServiceBus.snk"
 $script:packageVersion = "1.0.0"
-$nunitexec = "packages\NUnit.Runners.lite.2.6.0.12051\nunit-console.exe"
+$nunitexec = "tools\nunit\nunit-console.exe"
 $script:nunitTargetFramework = "/framework=4.0";
 
 include $toolsDir\psake\buildutils.ps1
@@ -36,6 +39,15 @@ task Init -depends Clean {
 	create-directory $binariesDir
 }
 
+task DetectOperatingSystemArchitecture {
+	$isWow64 = ((Get-WmiObject -class "Win32_Processor" -property "AddressWidth").AddressWidth -eq 64)
+	if ($isWow64 -eq $true)
+	{
+		$script:architecture = "x64"
+	}
+    echo "Machine Architecture is $script:architecture"
+}
+
 task InstallDependentPackages {
 	cd "$baseDir\packages"
 	$files =  dir -Exclude *.config
@@ -55,7 +67,7 @@ task InstallDependentPackages {
 	}
  }
 
-task InitEnvironment{
+task InitEnvironment -depends DetectOperatingSystemArchitecture {
 
 	if($script:isEnvironmentInitialized -ne $true){
 		if ($TargetFramework -eq "net-4.0"){
@@ -68,7 +80,13 @@ task InitEnvironment{
 
 			echo ".Net 4.0 build requested - $script:msBuild" 
 
-			$script:ilmergeTargetFramework  = "v4," + $netfxCurrent
+			$programFilesPath = (gc env:ProgramFiles)
+			if($script:architecture -eq "x64") {
+				$programFilesPath = (gc env:"ProgramFiles(x86)")
+			}
+
+			$frameworkPath = Join-Path $programFilesPath "Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0"
+			$script:ilmergeTargetFramework  =  "v4,$frameworkPath"
 
 			$script:msBuildTargetFramework ="/p:TargetFrameworkVersion=v4.0 /ToolsVersion:4.0"
 
@@ -84,7 +102,15 @@ task CompileMain -depends InstallDependentPackages, InitEnvironment, Init {
  	$solutionFile = "$sourceDir\OAuth.sln"
 	exec { &$script:msBuild $solutionFile /p:OutDir="$buildBase\" }
 
-	Copy-Item "$buildBase\OAuth2Provider.dll" $binariesDir
+	$assemblies = @()
+	$assemblies  +=  dir $buildBase\OAuth2Provider.dll
+	$assemblies  +=  dir $buildBase\newtonsoft.json.dll
+	$assemblies  +=  dir $buildBase\log4net.dll
+
+	& $ilMergeTool /lib:$baseDir /t:library /out:"$binariesDir\OAuth2Provider.dll" /targetplatform:$script:ilmergeTargetFramework /log:"$buildBase\MergeLog.txt" $assemblies
+	$mergeLogContent = Get-Content "$buildBase\MergeLog.txt"
+	echo "------------------------------Merge Log-----------------------"
+	echo $mergeLogContent
  }
 
  task TestMain -depends CompileMain {
@@ -97,6 +123,11 @@ task CompileMain -depends InstallDependentPackages, InitEnvironment, Init {
 	exec {&$nunitexec $testAssemblies $script:nunitTargetFramework}
 }
 
+task CompileSamples -depends InstallDependentPackages, InitEnvironment, Init {
+ 	$solutionFile = "$samplesDir\Samples.sln"
+	exec { &$script:msBuild $solutionFile }
+ }
+
 task PrepareRelease -depends CompileMain, TestMain {
 
 	if((Test-Path $releaseRoot) -eq $true){
@@ -128,16 +159,41 @@ task CreatePackages -depends PrepareRelease  {
 	$packit.packageOutPutDir = "$baseDir\release\packages"
 	$packit.targeted_Frameworks = "net40";
 
-	#region Packing NServiceBus
 	$packageName = "OAuth2Provider"
 	$packit.package_description = "OAuth 2 Provider"
-	invoke-packit $packageName $script:packageVersion @{log4net="[2.0.0]"; "Newtonsoft.Json"="[4.5.5]"} "binaries\OAuth2Provider.dll" @{} 
-	#endregion
+	invoke-packit $packageName $script:packageVersion @{} "binaries\OAuth2Provider.dll" @{} 
 
 	remove-module packit
  } 
+
+ task GenerateAssemblyInfo {
+	if($env:BUILD_NUMBER -ne $null) {
+    	$BuildNumber = $env:BUILD_NUMBER
+	}
+
+	Write-Output "Build Number: $BuildNumber"
+
+	$asmVersion = $ProductVersion + "." + $PatchVersion + "." + $BuildNumber 
+	$script:packageVersion = $asmVersion
+
+	Write-Output "##teamcity[buildNumber '$asmVersion']"
+
+		$asmInfo = "using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyCompany(""Micah Martin"")]
+[assembly: AssemblyFileVersion(""$asmVersion"")]
+[assembly: AssemblyVersion(""$asmVersion"")]
+[assembly: ComVisible(false)]		
+"
+
+	sc -Path "$baseDir\SharedAssemblyInfo.cs" -Value $asmInfo
+}
 
-task ReleaseOAuth -depends CreatePackages {
+task ReleaseOAuth -depends GenerateAssemblyInfo, CreatePackages, CompileSamples {
 
  }
 
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="..\src\OAuth2Provider\packages.config" />
-  <repository path="..\src\OAuth2Provider.Tests\packages.config" />
-  <repository path="..\samples\WebApiSample\packages.config" />
   <repository path="..\samples\MVC3Sample\packages.config" />
+  <repository path="..\src\OAuth2Provider.Tests\packages.config" />
+  <repository path="..\src\OAuth2Provider\packages.config" />
 </repositories>
diff --git a/samples/MVC3Sample/Controllers/OAuthController.cs b/samples/MVC3Sample/Controllers/OAuthController.cs
@@ -18,7 +18,7 @@ public ActionResult Token()
         {
             try
             {
-                var oauthRequest = new TokenRequest(new HttpRequestBaseRequest(Request), MvcApplication.ServiceLocator);
+                var oauthRequest = new TokenRequest(new OAuth2Provider.Request.HttpRequest(Request), MvcApplication.ServiceLocator);
 
                 var token = oauthRequest.Authorize();
 

diff --git a/samples/MVC3Sample/Controllers/SecureController.cs b/samples/MVC3Sample/Controllers/SecureController.cs
@@ -41,7 +41,7 @@ protected virtual void AuthorizeRequest(ActionExecutingContext filterContext)
 
             try
             {
-                var resourceRequest = new ResourceRequest(new HttpRequestBaseRequest(Request), _serviceLocator);
+                var resourceRequest = new ResourceRequest(new OAuth2Provider.Request.HttpRequest(Request), _serviceLocator);
                 isAuthorized = resourceRequest.Authorize();
 
                 TokenData = _serviceLocator.Issuer.DecodeAccessToken(resourceRequest.AccessToken);

diff --git a/samples/MVC3Sample/Global.asax.cs b/samples/MVC3Sample/Global.asax.cs
@@ -1,7 +1,6 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using OAuth2Provider;
-using Samples.Core;
 
 namespace MVC3Sample
 {

diff --git a/samples/MVC3Sample/MVC3Sample.csproj b/samples/MVC3Sample/MVC3Sample.csproj
@@ -48,8 +48,9 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="OAuth2Provider">
-      <HintPath>..\..\binaries\OAuth2Provider.dll</HintPath>
+    <Reference Include="OAuth2Provider, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\OAuth2Provider.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -60,9 +61,6 @@
       <Private>True</Private>
       <HintPath>..\packages\AspNetMvc.3.0.20105.0\lib\net40\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Providers">
-      <HintPath>..\packages\System.Web.Providers.Core.1.0\lib\net40\System.Web.Providers.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\AspNetRazor.Core.1.0.20105.407\lib\net40\System.Web.Razor.dll</HintPath>
@@ -113,6 +111,7 @@
     </Compile>
     <Compile Include="Models\AccountModels.cs" />
     <Compile Include="OAuthResult.cs" />
+    <Compile Include="OAuthServiceLocator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -189,12 +188,6 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Samples.Core\Samples.Core.csproj">
-      <Project>{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}</Project>
-      <Name>Samples.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/samples/Samples.Core/OAuthServiceLocator.cs → samples/MVC3Sample/OAuthServiceLocator.cs b/samples/Samples.Core/OAuthServiceLocator.cs → samples/MVC3Sample/OAuthServiceLocator.cs
@@ -6,7 +6,7 @@
 using OAuth2Provider.Issuer;
 using OAuth2Provider.Repository;
 
-namespace Samples.Core
+namespace MVC3Sample
 {
     public class OAuthServiceLocator : IOAuthServiceLocator
     {

diff --git a/samples/Samples.Core/Properties/AssemblyInfo.cs b/samples/Samples.Core/Properties/AssemblyInfo.cs
diff --git a/samples/Samples.Core/Samples.Core.csproj b/samples/Samples.Core/Samples.Core.csproj
diff --git a/samples/Samples.Core/Samples.Core.csproj.user b/samples/Samples.Core/Samples.Core.csproj.user
diff --git a/samples/Samples.sln b/samples/Samples.sln
@@ -1,30 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 11
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC3Sample", "MVC3Sample\MVC3Sample.csproj", "{8DE5B886-3454-4EE1-93EF-0737AB548F91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Core", "Samples.Core\Samples.Core.csproj", "{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiSample", "WebApiSample\WebApiSample.csproj", "{95E8328E-507E-4B33-989D-ECD2A267818E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8DE5B886-3454-4EE1-93EF-0737AB548F91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DE5B886-3454-4EE1-93EF-0737AB548F91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DE5B886-3454-4EE1-93EF-0737AB548F91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8DE5B886-3454-4EE1-93EF-0737AB548F91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95E8328E-507E-4B33-989D-ECD2A267818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95E8328E-507E-4B33-989D-ECD2A267818E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95E8328E-507E-4B33-989D-ECD2A267818E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95E8328E-507E-4B33-989D-ECD2A267818E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ public ActionResult Token() @@
             {
                 try
                 {
-                    var oauthRequest = new TokenRequest(new HttpRequestBaseRequest(Request), MvcApplication.ServiceLocator);
+                    var oauthRequest = new TokenRequest(new OAuth2Provider.Request.HttpRequest(Request), MvcApplication.ServiceLocator);
                     var token = oauthRequest.Authorize();
@@ Expand Down @@