Permalink
Browse files

Updated to Common.Logging 2.1.1, enabled NuGet package restore, remov…

…ed old libs (except for C5)
  • Loading branch information...
1 parent ddb566d commit df4d0869809ffd5dbb74daaea3a460f055a227e8 @lahma lahma committed Jun 24, 2012
View
@@ -45,12 +45,16 @@ _ReSharper*/
# Office Temp Files
~$*
+
+# Other
/src/Quartz/Quartz.xml
*.ReSharper
*.dotCover
-/package
+/package/*
*.snk
*.zip
website
/doc/apidoc
-*.nupkg
+*.nupkg
+/packages/*
+!/packages/repositories.config
View
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+</configuration>
View
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+ <!-- Enable the restore command to run before builds -->
+ <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
+
+ <!-- Property that enables building a package from a project -->
+ <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+ <!-- Download NuGet.exe if it does not already exist -->
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(PackageSources)' == '' ">
+ <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+ <!--
+ <PackageSource Include="https://nuget.org/api/v2/" />
+ <PackageSource Include="https://my-nuget-source/nuget/" />
+ -->
+ </ItemGroup>
+
+ <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+ <!-- Windows specific commands -->
+ <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+ <PackagesConfig>$([System.IO.Path]::Combine($(SolutionDir), "packages.config"))</PackagesConfig>
+ <PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+ <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+ <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+ <PackagesConfig>$(SolutionDir)packages.config</PackagesConfig>
+ <PackagesDir>$(SolutionDir)packages</PackagesDir>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- NuGet command -->
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+ <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+ <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+ <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <!-- Commands -->
+ <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" -o "$(PackagesDir)"</RestoreCommand>
+ <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+ RestorePackages;
+ $(BuildDependsOn);
+ </BuildDependsOn>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+ $(BuildDependsOn);
+ BuildPackage;
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CheckPrerequisites">
+ <!-- Raise an error if we're unable to locate nuget.exe -->
+ <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+ <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
+ <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+ </Target>
+
+ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(RestoreCommand)"
+ Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+ <Exec Command="$(RestoreCommand)"
+ LogStandardErrorAsError="true"
+ Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+ </Target>
+
+ <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(BuildCommand)"
+ Condition=" '$(OS)' != 'Windows_NT' " />
+
+ <Exec Command="$(BuildCommand)"
+ LogStandardErrorAsError="true"
+ Condition=" '$(OS)' == 'Windows_NT' " />
+ </Target>
+
+ <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <OutputFilename ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Reference Include="System.Core" />
+ <Using Namespace="System" />
+ <Using Namespace="System.IO" />
+ <Using Namespace="System.Net" />
+ <Using Namespace="Microsoft.Build.Framework" />
+ <Using Namespace="Microsoft.Build.Utilities" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ OutputFilename = Path.GetFullPath(OutputFilename);
+
+ Log.LogMessage("Downloading latest version of NuGet.exe...");
+ WebClient webClient = new WebClient();
+ webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+
+ return true;
+ }
+ catch (Exception ex) {
+ Log.LogErrorFromException(ex);
+ return false;
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+
+ <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <EnvKey ParameterType="System.String" Required="true" />
+ <EnvValue ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Using Namespace="System" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
+ }
+ catch {
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+</Project>
View
@@ -1,12 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{69B269BD-CB8C-438A-A32E-4CB7CEA47BB2}"
ProjectSection(SolutionItems) = preProject
- src\AssemblyInfo.cs = src\AssemblyInfo.cs
- changelog.txt = changelog.txt
Quartz.build = Quartz.build
Quartz.nuspec = Quartz.nuspec
+ changelog.txt = changelog.txt
+ packages.config = packages.config
readme.txt = readme.txt
+ src\AssemblyInfo.cs = src\AssemblyInfo.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "database", "database", "{A4C0607E-7BEA-4A00-90ED-A3EFB812D045}"
@@ -15,9 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tables", "tables", "{E1A1F9
ProjectSection(SolutionItems) = preProject
database\tables\tables_mysql_innodb.sql = database\tables\tables_mysql_innodb.sql
database\tables\tables_postgres.sql = database\tables\tables_postgres.sql
- database\tables\tables_sqlite.sql = database\tables\tables_sqlite.sql
database\tables\tables_sqlServer.sql = database\tables\tables_sqlServer.sql
database\tables\tables_sqlServerCe.sql = database\tables\tables_sqlServerCe.sql
+ database\tables\tables_sqlite.sql = database\tables\tables_sqlite.sql
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95F36186-4305-42A3-B57B-2F23769A5BB0}"
@@ -32,38 +33,45 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quartz.Tests.Integration.20
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quartz.Tests.Unit.2010", "src\Quartz.Tests.Unit\Quartz.Tests.Unit.2010.csproj", "{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{64F321FE-E33A-48CC-A300-992AB768E21B}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.Config = .nuget\NuGet.Config
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Release|Any CPU.Build.0 = Release|Any CPU
- {70A37974-17DE-474C-8A1C-19637622E75F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {70A37974-17DE-474C-8A1C-19637622E75F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {70A37974-17DE-474C-8A1C-19637622E75F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {70A37974-17DE-474C-8A1C-19637622E75F}.Release|Any CPU.Build.0 = Release|Any CPU
- {5587AF00-160F-4EC1-98A2-BEABA411256C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5587AF00-160F-4EC1-98A2-BEABA411256C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5587AF00-160F-4EC1-98A2-BEABA411256C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5587AF00-160F-4EC1-98A2-BEABA411256C}.Release|Any CPU.Build.0 = Release|Any CPU
{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5587AF00-160F-4EC1-98A2-BEABA411256C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5587AF00-160F-4EC1-98A2-BEABA411256C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5587AF00-160F-4EC1-98A2-BEABA411256C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5587AF00-160F-4EC1-98A2-BEABA411256C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {70A37974-17DE-474C-8A1C-19637622E75F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {70A37974-17DE-474C-8A1C-19637622E75F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {70A37974-17DE-474C-8A1C-19637622E75F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {70A37974-17DE-474C-8A1C-19637622E75F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AEF8823B-E45B-4B35-A4D0-C08C1196D017}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {A4C0607E-7BEA-4A00-90ED-A3EFB812D045} = {69B269BD-CB8C-438A-A32E-4CB7CEA47BB2}
- {E1A1F944-609E-400B-A7CC-EC5CE0F3BADC} = {A4C0607E-7BEA-4A00-90ED-A3EFB812D045}
- {5587AF00-160F-4EC1-98A2-BEABA411256C} = {95F36186-4305-42A3-B57B-2F23769A5BB0}
{3F8CA4D4-AE20-4767-8573-E39A17EC6F4E} = {95F36186-4305-42A3-B57B-2F23769A5BB0}
- {AEF8823B-E45B-4B35-A4D0-C08C1196D017} = {6EBE10AB-07CE-4C04-AD4D-75660778D4C2}
+ {5587AF00-160F-4EC1-98A2-BEABA411256C} = {95F36186-4305-42A3-B57B-2F23769A5BB0}
{70A37974-17DE-474C-8A1C-19637622E75F} = {6EBE10AB-07CE-4C04-AD4D-75660778D4C2}
+ {A4C0607E-7BEA-4A00-90ED-A3EFB812D045} = {69B269BD-CB8C-438A-A32E-4CB7CEA47BB2}
+ {AEF8823B-E45B-4B35-A4D0-C08C1196D017} = {6EBE10AB-07CE-4C04-AD4D-75660778D4C2}
+ {E1A1F944-609E-400B-A7CC-EC5CE0F3BADC} = {A4C0607E-7BEA-4A00-90ED-A3EFB812D045}
EndGlobalSection
EndGlobal
Oops, something went wrong.

0 comments on commit df4d086

Please sign in to comment.