Skip to content

Commit

Permalink
Made changes to build.
Browse files Browse the repository at this point in the history
- Added Build\Build.proj
- Made build produce NuGet packages.
  • Loading branch information
davidfowl committed Aug 21, 2011
1 parent cb6d38b commit cc98549
Show file tree
Hide file tree
Showing 17 changed files with 144 additions and 103 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -14,4 +14,5 @@ _ReSharper.*
*[Rr]e[Ss]harper.user
_ReSharper.*/
packages/*
Kudu.Services.Web/App_Data/*
Kudu.Services.Web/App_Data/*
artifacts/*
2 changes: 1 addition & 1 deletion .nuget/NuGet.settings.targets
Expand Up @@ -19,7 +19,7 @@

<!-- Commands -->
<RestoreCommand>"$(NuGetExePath)" install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
<BuildCommand>"$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)"</BuildCommand>
<BuildCommand>"$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols -verbose</BuildCommand>

<!-- Make the build depend on restore packages -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
Expand Down
38 changes: 38 additions & 0 deletions Build/Build.proj
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Go" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
<ProjectRoot>$(MSBuildProjectDirectory)\..</ProjectRoot>
<ArtifactsDir>$(ProjectRoot)\artifacts\$(Configuration)</ArtifactsDir>
<NuGetToolsPath>$(ProjectRoot)\.nuget</NuGetToolsPath>
<NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
</PropertyGroup>

<PropertyGroup>
<MajorVersion>0</MajorVersion>
<MinorVersion>5</MinorVersion>
<Version>$(MajorVersion).$(MinorVersion)</Version>
</PropertyGroup>

<Target Name="Go" DependsOnTargets="Build; BuildPackages">
</Target>

<Target Name="CreateOutputDir">
<MakeDir Directories="$(ArtifactsDir)" Condition="!Exists('$(ArtifactsDir)')" />
</Target>

<Target Name="Build" DependsOnTargets="CreateOutputDir">
<MSBuild Projects="$(ProjectRoot)\SignalR.sln" Targets="Build" Properties="Version=$(Version);PackageOutputDir=$(ArtifactsDir);Configuration=$(Configuration)" />
</Target>

<Target Name="BuildPackages">
<ItemGroup>
<JsPackage Include="$(ProjectRoot)\SignalR\Properties\SignalR.Js.nuspec" />
<MetaPackage Include="$(ProjectRoot)\SignalR\Properties\SignalR.All.nuspec" />
</ItemGroup>
<Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;%(JsPackage.Identity)&quot; -o &quot;$(ArtifactsDir)&quot; -p Version=$(Version) -basePath &quot;$(ProjectRoot)\SignalR&quot; -Verbose"
LogStandardErrorAsError="true" />
<Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;%(MetaPackage.Identity)&quot; -o &quot;$(ArtifactsDir)&quot; -p Version=$(Version) -exclude **\*.cs -Verbose"
LogStandardErrorAsError="true" />
</Target>
</Project>
14 changes: 14 additions & 0 deletions 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")]
26 changes: 0 additions & 26 deletions SignalR.Client/Properties/AssemblyInfo.cs
Expand Up @@ -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")]
12 changes: 12 additions & 0 deletions SignalR.Client/Properties/SignalR.Client.nuspec
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>$id$</id>
<version>$version$</version>
<authors>$author$</authors>
<description>$description$</description>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
</metadata>
</package>
6 changes: 5 additions & 1 deletion SignalR.Client/SignalR.Client.csproj
Expand Up @@ -28,7 +28,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;STABLE_VERSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -45,6 +45,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\SignalR.ScaleOut\HttpHelper.cs">
<Link>Infrastructure\HttpHelper.cs</Link>
</Compile>
Expand Down Expand Up @@ -73,6 +76,7 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Properties\SignalR.Client.nuspec" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
Expand Down
29 changes: 1 addition & 28 deletions SignalR.ScaleOut/Properties/AssemblyInfo.cs
Expand Up @@ -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")]
12 changes: 12 additions & 0 deletions SignalR.ScaleOut/Properties/SignalR.ScaleOut.nuspec
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>$id$</id>
<version>$version$</version>
<authors>$author$</authors>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
</metadata>
</package>
6 changes: 5 additions & 1 deletion SignalR.ScaleOut/SignalR.ScaleOut.csproj
Expand Up @@ -27,7 +27,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;STABLE_VERSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -45,6 +45,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="ConfigPeerUrlSource.cs" />
<Compile Include="HttpHelper.cs" />
<Compile Include="IJsonSerializer.cs" />
Expand All @@ -64,6 +67,7 @@
<Compile Include="SQLQueryNotificationsSignalBus.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\SignalR.ScaleOut.nuspec" />
<None Include="SignalRSignalsTable.sql" />
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions SignalR.sln
Expand Up @@ -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
Expand Down
35 changes: 2 additions & 33 deletions SignalR/Properties/AssemblyInfo.cs
Expand Up @@ -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")]
16 changes: 16 additions & 0 deletions SignalR/Properties/SignalR.All.nuspec
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>SignalR</id>
<version>$version$</version>
<authors>David Fowler and Damian Edwards</authors>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A client and server side library for ASP.NET that provides messaging and an abstraction over a persistant connection.</description>
<dependencies>
<dependency id="SignalR.Server" version="$version$" />
<dependency id="SignalR.Js" version="$version$" />
</dependencies>
</metadata>
</package>
18 changes: 18 additions & 0 deletions SignalR/Properties/SignalR.Js.nuspec
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>SignalR.Js</id>
<version>$version$</version>
<authors>David Fowler and Damian Edwards</authors>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Javascript library for SignalR</description>
<dependencies>
<dependency id="jQuery" version="1.6" />
</dependencies>
</metadata>
<files>
<file src="Scripts\jquery.signalR.*" target="Scripts" />
</files>
</package>
12 changes: 5 additions & 7 deletions SignalR/Properties/SignalR.nuspec
@@ -1,14 +1,12 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<package>
<metadata>
<id>$id$</id>
<id>$id$.Server</id>
<version>$version$</version>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<dependencies>
<dependency id="jQuery" version="1.6.1" />
</dependencies>
</metadata>
</metadata>
</package>
9 changes: 6 additions & 3 deletions SignalR/SignalR.csproj
Expand Up @@ -29,7 +29,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;STABLE_VERSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand All @@ -49,6 +49,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="CommandType.cs" />
<Compile Include="Hubs\ActionInfo.cs" />
<Compile Include="Hubs\HubMethodNameAttribute.cs" />
Expand Down Expand Up @@ -112,8 +115,8 @@
</None>
<None Include="Scripts\jquery-1.6.2-vsdoc.js" />
<None Include="Scripts\jquery-1.6.2.js" />
<Content Include="Scripts\jquery.signalR.min.js" />
<Content Include="Scripts\jquery.signalR.js" />
<None Include="Scripts\jquery.signalR.min.js" />
<None Include="Scripts\jquery.signalR.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\hubs.js" />
Expand Down
4 changes: 2 additions & 2 deletions 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
%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /p:Configuration="%config%" /m

0 comments on commit cc98549

Please sign in to comment.