Merge branch 'cleanup'

Particular · Apr 20, 2015 · b0b0aa3 · b0b0aa3
2 parents 78505b0 + 5a456af
commit b0b0aa3
Show file tree

Hide file tree

Showing 370 changed files with 321 additions and 411 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 nugets
+chocos/
 deploy
 build32
 binaries
@@ -31,6 +32,9 @@ installer/[F|f]iles
 installer/[C|c]ustom[A|a]ctions
 installer/ServiceControl-cache
 
+Index.dat
+Storage.dat
+
 # Created by https://www.gitignore.io
 
 ### VisualStudio ###

diff --git a/NextVersion.txt b/NextVersion.txt
diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
diff --git a/buildsupport/GitVersionTask/GitVersionCore.dll b/buildsupport/GitVersionTask/GitVersionCore.dll
diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll
diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll
diff --git a/buildsupport/MSBuild.Community.Tasks.dll b/buildsupport/MSBuild.Community.Tasks.dll
diff --git a/gitversionconfig.yaml b/gitversionconfig.yaml
@@ -0,0 +1 @@
+assembly-versioning-scheme: MajorMinorPatch
diff --git a/src/Chocolatey/ServiceInsight.install.nuspec → packaging/chocolatey/Setup.install.nuspec b/src/Chocolatey/ServiceInsight.install.nuspec → packaging/chocolatey/Setup.install.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>ServiceInsight.install</id>
     <version>$version$</version>
-    <title>ServiceInsight.install</title>
+    <title>ServiceInsight</title>
     <authors>Particular Software</authors>
     <owners>Particular Software</owners>
     <projectUrl>http://particular.net/ServiceInsight</projectUrl>
@@ -12,9 +12,15 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>ServiceInsight for NServiceBus. Complete under-the-hood view of the your system's behavior, clearly displayed and visualized, immediately available and up-to-date. Whether in development, testing or production, ServiceInsight provides all the system-critical information you need.</description>
     <summary></summary>
-    <tags>nservicebus particular chocolatey ServiceInsight</tags>
+    <tags>nservicebus particular chocolatey ServiceInsight admin</tags>
     <dependencies>
       <dependency id="DotNet4.5" version="4.5.20120822" />
+      <dependency id="chocolatey" version="0.9.9" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="Chocolatey\chocolateyInstall.ps1" target="Tools" />
+    <file src="Chocolatey\chocolateyUninstall.ps1" target="Tools" />
+    <file src="Chocolatey\elevatedUninstall.ps1" target="Tools" />
+  </files>
 </package>
diff --git a/src/Chocolatey/Build.targets b/src/Chocolatey/Build.targets
diff --git a/src/Chocolatey/Chocolatey.csproj b/src/Chocolatey/Chocolatey.csproj
diff --git a/src/Chocolatey/chocolateyInstall.ps1 b/src/Chocolatey/chocolateyInstall.ps1
diff --git a/src/Chocolatey/chocolateyUninstall.ps1 b/src/Chocolatey/chocolateyUninstall.ps1
diff --git a/src/Chocolatey/elevatedUninstall.ps1 b/src/Chocolatey/elevatedUninstall.ps1
diff --git a/src/Chocolatey/readme.txt b/src/Chocolatey/readme.txt
diff --git a/src/ServiceInsight.Desktop/packages.config b/src/ServiceInsight.Desktop/packages.config
diff --git a/src/ServiceInsight.FunctionalTests/ServiceInsight.FunctionalTests.csproj b/src/ServiceInsight.FunctionalTests/ServiceInsight.FunctionalTests.csproj
@@ -40,9 +40,9 @@
     <Reference Include="ApprovalUtilities">
       <HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=3.4.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Autofac.3.4.1\lib\net40\Autofac.dll</HintPath>
+      <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro, Version=1.5.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -55,7 +55,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
@@ -130,12 +130,6 @@
     <Compile Include="UI\Steps\DockLayoutWindowToLeft.cs" />
     <Compile Include="UITest.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ServiceInsight.Desktop\ServiceInsight.Desktop.csproj">
-      <Project>{c7eb8bb8-813b-4cfd-83df-7f38d8dd89ef}</Project>
-      <Name>ServiceInsight.Desktop</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config">
@@ -146,6 +140,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\ServiceInsight\ServiceInsight.csproj">
+      <Project>{c7eb8bb8-813b-4cfd-83df-7f38d8dd89ef}</Project>
+      <Name>ServiceInsight</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>