From cc98549a0832ea0e223ebe13181f3b95c37a5c0e Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 20 Aug 2011 20:20:01 -0700 Subject: [PATCH] Made changes to build. - Added Build\Build.proj - Made build produce NuGet packages. --- .gitignore | 3 +- .nuget/NuGet.settings.targets | 2 +- Build/Build.proj | 38 +++++++++++++++++++ Common/CommonAssemblyInfo.cs | 14 +++++++ SignalR.Client/Properties/AssemblyInfo.cs | 26 ------------- .../Properties/SignalR.Client.nuspec | 12 ++++++ SignalR.Client/SignalR.Client.csproj | 6 ++- SignalR.ScaleOut/Properties/AssemblyInfo.cs | 29 +------------- .../Properties/SignalR.ScaleOut.nuspec | 12 ++++++ SignalR.ScaleOut/SignalR.ScaleOut.csproj | 6 ++- SignalR.sln | 5 +++ SignalR/Properties/AssemblyInfo.cs | 35 +---------------- SignalR/Properties/SignalR.All.nuspec | 16 ++++++++ SignalR/Properties/SignalR.Js.nuspec | 18 +++++++++ SignalR/Properties/SignalR.nuspec | 12 +++--- SignalR/SignalR.csproj | 9 +++-- build.cmd | 4 +- 17 files changed, 144 insertions(+), 103 deletions(-) create mode 100644 Build/Build.proj create mode 100644 Common/CommonAssemblyInfo.cs create mode 100644 SignalR.Client/Properties/SignalR.Client.nuspec create mode 100644 SignalR.ScaleOut/Properties/SignalR.ScaleOut.nuspec create mode 100644 SignalR/Properties/SignalR.All.nuspec create mode 100644 SignalR/Properties/SignalR.Js.nuspec diff --git a/.gitignore b/.gitignore index 5a45732bbe..0d44648c35 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ _ReSharper.* *[Rr]e[Ss]harper.user _ReSharper.*/ packages/* -Kudu.Services.Web/App_Data/* \ No newline at end of file +Kudu.Services.Web/App_Data/* +artifacts/* \ No newline at end of file diff --git a/.nuget/NuGet.settings.targets b/.nuget/NuGet.settings.targets index 23c0a31813..34c60bedde 100644 --- a/.nuget/NuGet.settings.targets +++ b/.nuget/NuGet.settings.targets @@ -19,7 +19,7 @@ "$(NuGetExePath)" install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)" - "$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" + "$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols -verbose diff --git a/Build/Build.proj b/Build/Build.proj new file mode 100644 index 0000000000..edcf8b7184 --- /dev/null +++ b/Build/Build.proj @@ -0,0 +1,38 @@ + + + + Debug + $(MSBuildProjectDirectory)\.. + $(ProjectRoot)\artifacts\$(Configuration) + $(ProjectRoot)\.nuget + $(NuGetToolsPath)\nuget.exe + + + + 0 + 5 + $(MajorVersion).$(MinorVersion) + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Common/CommonAssemblyInfo.cs b/Common/CommonAssemblyInfo.cs new file mode 100644 index 0000000000..f767b787d5 --- /dev/null +++ b/Common/CommonAssemblyInfo.cs @@ -0,0 +1,14 @@ +using System.Reflection; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyCompany("David Fowler and Damian Edwards")] +[assembly: AssemblyCopyright("Copyright © David Fowler and Damian Edwards 2011")] + +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyConfiguration("")] + +[assembly: AssemblyVersion("0.5.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/SignalR.Client/Properties/AssemblyInfo.cs b/SignalR.Client/Properties/AssemblyInfo.cs index cb886ae38c..d04ae366cf 100644 --- a/SignalR.Client/Properties/AssemblyInfo.cs +++ b/SignalR.Client/Properties/AssemblyInfo.cs @@ -6,30 +6,4 @@ // associated with an assembly. [assembly: AssemblyTitle("SignalR.Client")] [assembly: AssemblyDescription(".NET client for SignalR")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SignalR.Client")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("41e53abd-f2b0-40ea-bb54-8d5f96582b66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.*")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SignalR.Client/Properties/SignalR.Client.nuspec b/SignalR.Client/Properties/SignalR.Client.nuspec new file mode 100644 index 0000000000..4ffef3abaa --- /dev/null +++ b/SignalR.Client/Properties/SignalR.Client.nuspec @@ -0,0 +1,12 @@ + + + + $id$ + $version$ + $author$ + $description$ + https://github.com/SignalR/SignalR/blob/master/LICENSE.md + https://github.com/SignalR/SignalR + false + + \ No newline at end of file diff --git a/SignalR.Client/SignalR.Client.csproj b/SignalR.Client/SignalR.Client.csproj index 259fbd0b3d..9472710e95 100644 --- a/SignalR.Client/SignalR.Client.csproj +++ b/SignalR.Client/SignalR.Client.csproj @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;STABLE_VERSION prompt 4 @@ -45,6 +45,9 @@ + + Properties\CommonAssemblyInfo.cs + Infrastructure\HttpHelper.cs @@ -73,6 +76,7 @@ + diff --git a/SignalR.ScaleOut/Properties/AssemblyInfo.cs b/SignalR.ScaleOut/Properties/AssemblyInfo.cs index 8353d312bf..b1e09db7b1 100644 --- a/SignalR.ScaleOut/Properties/AssemblyInfo.cs +++ b/SignalR.ScaleOut/Properties/AssemblyInfo.cs @@ -5,31 +5,4 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SignalR.ScaleOut")] -[assembly: AssemblyDescription("Scale out signal buses and message stores for SignalR for use in web farms")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SignalR")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8565e3ac-fd4c-4bb6-b6f2-3814ac0a9a32")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.*")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyDescription("Scale out signal buses and message stores for SignalR for use in web farms")] \ No newline at end of file diff --git a/SignalR.ScaleOut/Properties/SignalR.ScaleOut.nuspec b/SignalR.ScaleOut/Properties/SignalR.ScaleOut.nuspec new file mode 100644 index 0000000000..08e9f9b42e --- /dev/null +++ b/SignalR.ScaleOut/Properties/SignalR.ScaleOut.nuspec @@ -0,0 +1,12 @@ + + + + $id$ + $version$ + $author$ + https://github.com/SignalR/SignalR/blob/master/LICENSE.md + https://github.com/SignalR/SignalR + false + $description$ + + \ No newline at end of file diff --git a/SignalR.ScaleOut/SignalR.ScaleOut.csproj b/SignalR.ScaleOut/SignalR.ScaleOut.csproj index 4f963e5688..f2125dc680 100644 --- a/SignalR.ScaleOut/SignalR.ScaleOut.csproj +++ b/SignalR.ScaleOut/SignalR.ScaleOut.csproj @@ -27,7 +27,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;STABLE_VERSION prompt 4 @@ -45,6 +45,9 @@ + + Properties\CommonAssemblyInfo.cs + @@ -64,6 +67,7 @@ + diff --git a/SignalR.sln b/SignalR.sln index d1c10d1cc2..9aceeaba1f 100644 --- a/SignalR.sln +++ b/SignalR.sln @@ -9,6 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SignalR.ScaleOut", "SignalR EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SignalR.Client", "SignalR.Client\SignalR.Client.csproj", "{EB46B9C6-EE37-48F9-835E-E49580E40E0A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{1E4BA77C-4977-40AA-B297-3A2CB9990ABF}" + ProjectSection(SolutionItems) = preProject + Build\Build.proj = Build\Build.proj + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/SignalR/Properties/AssemblyInfo.cs b/SignalR/Properties/AssemblyInfo.cs index 0704d6a7a5..decdf3124b 100644 --- a/SignalR/Properties/AssemblyInfo.cs +++ b/SignalR/Properties/AssemblyInfo.cs @@ -2,37 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SignalR.Core")] -[assembly: AssemblyDescription("A client and server side library for ASP.NET that provides messaging and an abstraction over a persistant connection.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SignalR.Core")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("960f3974-c967-4b92-b196-5747f9b49552")] - +[assembly: AssemblyTitle("SignalR.Server")] +[assembly: AssemblyDescription("An ASP.NET library for authoring SignalR services.")] [assembly: InternalsVisibleTo("SignalR.ScaleOut")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.*")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/SignalR/Properties/SignalR.All.nuspec b/SignalR/Properties/SignalR.All.nuspec new file mode 100644 index 0000000000..fa9b00f993 --- /dev/null +++ b/SignalR/Properties/SignalR.All.nuspec @@ -0,0 +1,16 @@ + + + + SignalR + $version$ + David Fowler and Damian Edwards + https://github.com/SignalR/SignalR/blob/master/LICENSE.md + https://github.com/SignalR/SignalR + false + A client and server side library for ASP.NET that provides messaging and an abstraction over a persistant connection. + + + + + + \ No newline at end of file diff --git a/SignalR/Properties/SignalR.Js.nuspec b/SignalR/Properties/SignalR.Js.nuspec new file mode 100644 index 0000000000..0155cbc620 --- /dev/null +++ b/SignalR/Properties/SignalR.Js.nuspec @@ -0,0 +1,18 @@ + + + + SignalR.Js + $version$ + David Fowler and Damian Edwards + https://github.com/SignalR/SignalR/blob/master/LICENSE.md + https://github.com/SignalR/SignalR + false + Javascript library for SignalR + + + + + + + + \ No newline at end of file diff --git a/SignalR/Properties/SignalR.nuspec b/SignalR/Properties/SignalR.nuspec index aa791b7b9d..3df7075b88 100644 --- a/SignalR/Properties/SignalR.nuspec +++ b/SignalR/Properties/SignalR.nuspec @@ -1,14 +1,12 @@ - + - $id$ + $id$.Server $version$ $author$ - $author$ + https://github.com/SignalR/SignalR/blob/master/LICENSE.md + https://github.com/SignalR/SignalR false $description$ - - - - + \ No newline at end of file diff --git a/SignalR/SignalR.csproj b/SignalR/SignalR.csproj index 6fc7d1a593..72a5cd388c 100644 --- a/SignalR/SignalR.csproj +++ b/SignalR/SignalR.csproj @@ -29,7 +29,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;STABLE_VERSION prompt 4 @@ -49,6 +49,9 @@ + + Properties\CommonAssemblyInfo.cs + @@ -112,8 +115,8 @@ - - + + diff --git a/build.cmd b/build.cmd index 8ac744223c..329d8ede34 100644 --- a/build.cmd +++ b/build.cmd @@ -1,6 +1,6 @@ @echo Off set config=%1 if "%config%" == "" ( - set config=debug + set config=Debug ) -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Signalr.sln /p:Configuration="%config%" /m \ No newline at end of file +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /p:Configuration="%config%" /m \ No newline at end of file