Skip to content

Commit

Permalink
Merge into development from TFS development
Browse files Browse the repository at this point in the history
  • Loading branch information
Chasdigal committed Feb 11, 2015
2 parents ac5a1af + df523bd commit f8058fa
Show file tree
Hide file tree
Showing 1,300 changed files with 516,040 additions and 13,214 deletions.
102 changes: 62 additions & 40 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*.suo
*.user
*.ide
*.bkp

####################################################################################
# Build working directories
Expand All @@ -18,6 +19,7 @@
/Dev/TestResults
/bin
/TestResults
/Logs

####################################################################################
# Server Build Output Folders
Expand All @@ -41,6 +43,16 @@
/Dev/Dev2.Server/bin/Debug/*.manifest
/Dev/Dev2.Server/bin/Debug/*.log
/Dev/Dev2.Server/bin/Debug/*.cer
/Dev/Dev2.Server/bin/Debug/de
/Dev/Dev2.Server/bin/Debug/en
/Dev/Dev2.Server/bin/Debug/en-gb
/Dev/Dev2.Server/bin/Debug/es
/Dev/Dev2.Server/bin/Debug/fr
/Dev/Dev2.Server/bin/Debug/it
/Dev/Dev2.Server/bin/Debug/ja
/Dev/Dev2.Server/bin/Debug/ko
/Dev/Dev2.Server/bin/Debug/zh-Hans
/Dev/Dev2.Server/bin/Debug/zh-Hant
####################################################################################
# Other Build Output Folders
####################################################################################
Expand Down Expand Up @@ -156,12 +168,60 @@
/Dev/Dev2.Sql.Tests/obj
/Dev/Dev2.TaskScheduler.Wrappers.Test/bin
/Dev/Dev2.TaskScheduler.Wrappers.Test/obj
/Dev/Example Shipper/Example Shipper/bin
/Dev/Example Shipper/Example Shipper/obj
/Dev/ServerProxyLayer/bin
/Dev/ServerProxyLayer/obj
/Dev/ServerProxyLayerTests/bin
/Dev/ServerProxyLayerTests/obj
/Dev/SFTPServer/bin
/Dev/SFTPServer/obj
/Dev/Studio.UI.Load.Specs/bin
/Dev/Studio.UI.Load.Specs/obj
/Dev/Example Shipper/Example Shipper/bin
/Dev/Example Shipper/Example Shipper/obj
/Dev/Test.Localisation/bin
/Dev/Test.Localisation/obj
/Dev/Warewolf.AcceptanceTesting.Core/bin
/Dev/Warewolf.AcceptanceTesting.Core/obj
/Dev/Warewolf.AcceptanceTesting.Help/bin
/Dev/Warewolf.AcceptanceTesting.Help/obj
/Dev/Warewolf.AcceptanceTesting.Explorer/bin
/Dev/Warewolf.AcceptanceTesting.Explorer/obj
/Dev/Warewolf.Studio/bin
/Dev/Warewolf.Studio/obj
/Dev/Warewolf.Studio.Core/bin
/Dev/Warewolf.Studio.Core/obj
/Dev/Warewolf.Studio.Resources/bin
/Dev/Warewolf.Studio.Resources/obj
/Dev/Warewolf.Studio.Specs/bin
/Dev/Warewolf.Studio.Specs/obj
/Dev/Warewolf.Studio.ViewModels/bin
/Dev/Warewolf.Studio.ViewModels/obj
/Dev/Warewolf.Studio.ViewModels.Tests/bin
/Dev/Warewolf.Studio.ViewModels.Tests/obj
/Dev/Warewolf.Studio.Views/bin
/Dev/Warewolf.Studio.Views/obj
/Dev/Warewolf.Core/bin
/Dev/Warewolf.Core/obj
/Dev/Warewolf.Core.Test/bin
/Dev/Warewolf.Core.Test/obj
/Dev/Warewolf.Studio.Core.Test/bin
/Dev/Warewolf.Studio.Core.Test/obj
/Dev/Warewolf.Studio.Models/bin
/Dev/Warewolf.Studio.Models/obj
/Dev/Warewolf.Studio.Models.Tests/bin
/Dev/Warewolf.Studio.Models.Tests/obj
/Dev/Warewolf.Studio.Themes.Luna/bin
/Dev/Warewolf.Studio.Themes.Luna/obj
/Dev/Warewolf.UnittestingUtils/bin
/Dev/Warewolf.UnittestingUtils/obj
/Dev/Warewolf.Studio.AntiCorruptionLayer/bin
/Dev/Warewolf.Studio.AntiCorruptionLayer/obj
/Dev/Warewolf.Studio.AntiCorruptionLayer.Tests/bin
/Dev/Warewolf.Studio.AntiCorruptionLayer.Tests/obj
/Dev/Warewolf.Studio.CustomControls/bin
/Dev/Warewolf.Studio.CustomControls/obj
/Dev/Warewolf.Studio.CustomControls.Tests/bin
/Dev/Warewolf.Studio.CustomControls.Tests/obj

####################################################################################
# These release workflows must be stored in "/Dev/BPM Resources - Release/Resources" ONLY!
Expand Down Expand Up @@ -238,41 +298,3 @@
/Dev/Dev2.Server/bin/Debug/Resources/Sample Project/WarewolfShoppingCartDB.xml
/Dev/Dev2.Server/bin/Debug/Resources/SqlServers/DemoDB.xml
/Dev/Dev2.Server/bin/Debug/Resources/Hello World.xml
Dev/ConsoleAppToTestExecuteCommandLineActivity/backup/ConsoleAppToTestExecuteCommandLineActivity.csproj.bkp
Dev/Dev2.Activities.Designers.Tests/backup/Dev2.Activities.Designers.Tests.csproj.bkp
Dev/Dev2.Activities.Tests/backup/Dev2.Activities.Tests.csproj.bkp
Dev/Dev2.Activities/backup/Dev2.Activities.csproj.bkp
Dev/Dev2.Common.Interfaces/backup/Dev2.Common.Interfaces.csproj.bkp
Dev/Dev2.Common.Test/backup/Dev2.Common.Tests.csproj.bkp
Dev/Dev2.Common/backup/Dev2.Common.csproj.bkp
Dev/Dev2.Core.Tests/backup/Dev2.Core.Tests.csproj.bkp
Dev/Dev2.Core.Tests/backup/MathOperationTest/FunctionTest.cs.bkp
Dev/Dev2.Core.Tests/backup/MathOperationTest/InfragisticsEvaluationTest.cs.bkp
Dev/Dev2.Crypto.HashGenerator/backup/Dev2.Crypto.HashGenerator.csproj.bkp
Dev/Dev2.CustomControls.Tests/backup/Dev2.CustomControls.Tests.csproj.bkp
Dev/Dev2.Data.Tests/backup/Dev2.Data.Tests.csproj.bkp
Dev/Dev2.Data/backup/Dev2.Data.csproj.bkp
Dev/Dev2.Data/backup/MathOperations/Function.cs.bkp
Dev/Dev2.Data/backup/MathOperations/FunctionEvaluator.cs.bkp
Dev/Dev2.Data/backup/MathOperations/FunctionRepository.cs.bkp
Dev/Dev2.Data/backup/MathOperations/Interfaces/IFunction.cs.bkp
Dev/Dev2.Development.Languages/backup/Dev2.Development.Languages.csproj.bkp
Dev/Dev2.Diagnostics/backup/Dev2.Diagnostics.csproj.bkp
Dev/Dev2.Infrastructure.Tests/backup/Dev2.Infrastructure.Tests.csproj.bkp
Dev/Dev2.Infrastructure/backup/Dev2.Infrastructure.csproj.bkp
Dev/Dev2.Instrumentation/backup/Dev2.Instrumentation.csproj.bkp
Dev/Dev2.Network/backup/Dev2.Network.csproj.bkp
Dev/Dev2.OutputLibraries/backup/Dev2.OutputLibraries.csproj.bkp
Dev/Dev2.Scheduler.Test/backup/Dev2.Scheduler.Tests.csproj.bkp
Dev/Dev2.Scheduler/backup/Dev2.Scheduler.csproj.bkp
Dev/Dev2.Services.Execution/backup/Dev2.Services.Execution.csproj.bkp
Dev/Dev2.Services.Sql/backup/Dev2.Services.Sql.csproj.bkp
Dev/Dev2.Studio.Core.Tests/backup/Dock/ContentPaneFactoryTests.cs.bkp
Dev/Dev2.Studio.Core/backup/AppResources/ExtensionMethods/PaneLocationExtensions.cs.bkp
Dev/Dev2.Studio.Core/backup/AppResources/WindowManagers/IDockAwareWindowManager.cs.bkp
Dev/Dev2.Studio.Core/backup/AppResources/WindowManagers/XamDockManagerDockAwareWindowManager.cs.bkp
Dev/Dev2.TaskScheduler.Wrappers.Test/backup/Dev2.TaskScheduler.Wrappers.Tests.csproj.bkp
Dev/Dev2.TaskScheduler.Wrappers/backup/Dev2.TaskScheduler.Wrappers.csproj.bkp
Dev/Dev2.UndoFramework.Tests/backup/Dev2.UndoFramework.Tests.csproj.bkp
Dev/Dev2.UndoFramework/backup/Dev2.UndoFramework.csproj.bkp
Dev/Dev2.Util/backup/Dev2.Util.csproj.bkp
6 changes: 6 additions & 0 deletions Dev/.nuget/NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
Binary file added Dev/.nuget/NuGet.exe
Binary file not shown.
144 changes: 144 additions & 0 deletions Dev/.nuget/NuGet.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<?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>

<!-- Determines if package restore consent is required to restore packages -->
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>

<!-- 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, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
<!--
<PackageSource Include="https://www.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>
</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>
</PropertyGroup>

<PropertyGroup>
<PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
<PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
</PropertyGroup>

<PropertyGroup>
<PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
<PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
</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>

<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>

<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>

<!-- Commands -->
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>

<!-- We need to ensure packages are restored prior to assembly resolve -->
<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)'" />
<!--
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
</Target>

<Target Name="_DownloadNuGet">
<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://www.nuget.org/nuget.exe", OutputFilename);
return true;
}
catch (Exception ex) {
Log.LogErrorFromException(ex);
return false;
}
]]>
</Code>
</Task>
</UsingTask>
</Project>
Loading

0 comments on commit f8058fa

Please sign in to comment.