SyncOMatic update

Particular · Mar 5, 2014 · a3962cb · a3962cb
1 parent 9e48e3d
commit a3962cb
Show file tree

Hide file tree

Showing 26 changed files with 11 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 nugets
-build
 build32
 binaries
 obj
@@ -35,5 +34,5 @@ csx
 _NCrunch_NServiceBus/*
 logs
 run-git.cmd
-
-*.jtconfig
+src/Chocolatey/Build/*
+App_Packages
diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll
diff --git a/buildsupport/FubuCore.pdb b/buildsupport/FubuCore.pdb
diff --git a/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets b/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets
@@ -7,10 +7,16 @@
   <UsingTask
       TaskName="GitFlowVersionTask.UpdateAssemblyInfo"
       AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+  <UsingTask
+      TaskName="GitFlowVersionTask.WriteVersionInfoToBuildLog"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
 
     <Target Name="UpdateAssemblyInfo"
             BeforeTargets="CoreCompile">
-        <GitFlowVersionTask.UpdateAssemblyInfo 
+      <WriteVersionInfoToBuildLog
+        SolutionDirectory="$(SolutionDir)"
+        />
+        <UpdateAssemblyInfo 
           SolutionDirectory="$(SolutionDir)"
           AssemblyName="$(AssemblyName)" 
           ProjectFile="$(ProjectPath)" 
@@ -19,14 +25,11 @@
           <Output 
             TaskParameter="AssemblyInfoTempFilePath" 
             PropertyName="AssemblyInfoTempFilePath" />
-        </GitFlowVersionTask.UpdateAssemblyInfo>
-        <Message Text="$(AssemblyInfoTempFilePath)" />
+        </UpdateAssemblyInfo>
 
-        <Message Text="BeforeInjection @(Compile)" />
         <ItemGroup>
             <Compile Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
-        <Message Text="AfterInjection @(Compile)" />
     </Target>
 
   <!--Support for ncrunch-->

diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.exe b/buildsupport/GitFlowVersion/GitFlowVersion.exe
diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.pdb b/buildsupport/GitFlowVersion/GitFlowVersion.pdb
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.dll b/buildsupport/GitFlowVersion/GitFlowVersionTask.dll
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb b/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb
diff --git a/buildsupport/GitFlowVersion/LibGit2Sharp.dll b/buildsupport/GitFlowVersion/LibGit2Sharp.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-11f8336.dll b/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-11f8336.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-65e9dc6.dll b/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-65e9dc6.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll b/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-65e9dc6.dll b/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-65e9dc6.dll
diff --git a/buildsupport/MSBuild.Community.Tasks.dll b/buildsupport/MSBuild.Community.Tasks.dll
diff --git a/buildsupport/NuGet.Core.dll b/buildsupport/NuGet.Core.dll
diff --git a/buildsupport/PepitaPackage.dll b/buildsupport/PepitaPackage.dll
diff --git a/buildsupport/RippleRestoreTask.dll b/buildsupport/RippleRestoreTask.dll
diff --git a/buildsupport/RippleRestoreTask.pdb b/buildsupport/RippleRestoreTask.pdb
diff --git a/buildsupport/RippleRestoreTask.targets b/buildsupport/RippleRestoreTask.targets
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-    <BuildDependsOn>
+    <BuildDependsOn Condition="'$(NCrunch)' != '1'">
       RippleRestoreTarget;
       $(BuildDependsOn);
     </BuildDependsOn>

diff --git a/buildsupport/Timestamp/Build/Timestamp.targets b/buildsupport/Timestamp/Build/Timestamp.targets
diff --git a/buildsupport/Timestamp/Timestamp.dll b/buildsupport/Timestamp/Timestamp.dll
diff --git a/buildsupport/Timestamp/Timestamp.pdb b/buildsupport/Timestamp/Timestamp.pdb
diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe
diff --git a/buildsupport/ripple.pdb b/buildsupport/ripple.pdb
diff --git a/buildsupport/run-git.cmd b/buildsupport/run-git.cmd
diff --git a/src/NServiceBus.sln.DotSettings b/src/NServiceBus.sln.DotSettings
@@ -16,7 +16,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConditionalTernaryEqualBranch/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConditionIsAlwaysTrueOrFalse/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstantNullCoalescingCondition/@EntryIndexedValue">ERROR</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CSharpWarnings_003A_003ACS0109/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyConstructor/@EntryIndexedValue">ERROR</s:String>
@@ -30,7 +29,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleOrderBy/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedVariable/@EntryIndexedValue">ERROR</s:String>