Merge pull request #811 from github/grokys/ncrunch

shana · web-flow · commit d7d8b5201458 · 2017-02-07T12:43:55.000+01:00
Add support for NCrunch
diff --git a/.gitignore b/.gitignore
@@ -99,7 +99,6 @@ _TeamCity*
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
-*.ncrunch*
 
 # MightyMoose
 *.mm.*
diff --git a/GitHubVS.v3.ncrunchsolution b/GitHubVS.v3.ncrunchsolution
@@ -0,0 +1,9 @@
+﻿<SolutionConfiguration>
+  <Settings>
+    <AdditionalFilesToIncludeForSolution>
+      <Value>lib\**.*</Value>
+    </AdditionalFilesToIncludeForSolution>
+    <AllowParallelTestExecution>False</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
diff --git a/src/CredentialManagement/CredentialManagement.v3.ncrunchproject b/src/CredentialManagement/CredentialManagement.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/DesignTimeStyleHelper/DesignTimeStyleHelper.v3.ncrunchproject b/src/DesignTimeStyleHelper/DesignTimeStyleHelper.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.Api/GitHub.Api.v3.ncrunchproject b/src/GitHub.Api/GitHub.Api.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.App/GitHub.App.v3.ncrunchproject b/src/GitHub.App/GitHub.App.v3.ncrunchproject
@@ -0,0 +1,6 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.v3.ncrunchproject b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.Exports/GitHub.Exports.v3.ncrunchproject b/src/GitHub.Exports/GitHub.Exports.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.v3.ncrunchproject b/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.Extensions/GitHub.Extensions.v3.ncrunchproject b/src/GitHub.Extensions/GitHub.Extensions.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.StartPage/GitHub.StartPage.csproj b/src/GitHub.StartPage/GitHub.StartPage.csproj
@@ -181,7 +181,7 @@
     <EmbeddedResource Include="Resources.resx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/src/GitHub.StartPage/GitHub.StartPage.v3.ncrunchproject b/src/GitHub.StartPage/GitHub.StartPage.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.v3.ncrunchproject b/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.v3.ncrunchproject b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.v3.ncrunchproject b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.UI/GitHub.UI.v3.ncrunchproject b/src/GitHub.UI/GitHub.UI.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.v3.ncrunchproject b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -390,7 +390,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\GitHub.StartPage\build\GitHub.StartPage.pkgdef">
+    <Content Include="..\GitHub.StartPage\build\GitHub.StartPage.pkgdef" Condition="'$(NCrunch)' != '1'">
       <Link>GitHub.StartPage.pkgdef</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -699,7 +699,7 @@
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
   <Import Project="packaging.targets" />
   <!-- For regenerating templates on build -->
   <Import Project="$(SolutionDir)\src\common\t4.targets" />
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.v3.ncrunchproject b/src/GitHub.VisualStudio/GitHub.VisualStudio.v3.ncrunchproject
@@ -0,0 +1,5 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/TrackingCollectionTests/TrackingCollectionTests.v3.ncrunchproject b/src/TrackingCollectionTests/TrackingCollectionTests.v3.ncrunchproject
@@ -0,0 +1,15 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <DefaultTestTimeout>5000</DefaultTestTimeout>
+    <HiddenComponentWarnings>
+      <Value>AbnormalReferenceResolution</Value>
+    </HiddenComponentWarnings>
+    <IgnoredTests>
+      <NamedTestSelector>
+        <TestName>TrackingTests.OrderByDoesntMatchOriginalOrderTimings</TestName>
+      </NamedTestSelector>
+    </IgnoredTests>
+    <PreloadReferencedAssemblies>True</PreloadReferencedAssemblies>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/UnitTests/GitHub.App/Services/AvatarProviderTests.cs b/src/UnitTests/GitHub.App/Services/AvatarProviderTests.cs
@@ -17,7 +17,7 @@ public class AvatarProviderTests
 {
     public class TheDefaultOrgBitmapImageProperty : TestBaseClass
     {
-        [STAFact]
+        [Fact]
         public async Task CanBeAccessedFromMultipleThreads()
         {
             var blobCache = new InMemoryBlobCache();
@@ -42,7 +42,7 @@ public async Task CanBeAccessedFromMultipleThreads()
 
     public class TheDefaultUserBitmapImageProperty : TestBaseClass
     {
-        [STAFact]
+        [Fact]
         public async Task CanBeAccessedFromMultipleThreads()
         {
             var blobCache = new InMemoryBlobCache();
@@ -67,7 +67,7 @@ public async Task CanBeAccessedFromMultipleThreads()
 
     public class TheGetAvatarMethod : TestBaseClass
     {
-        [STAFact]
+        [Fact]
         public async Task GetsAvatarFromCache()
         {
             var expectedImage = AvatarProvider.CreateBitmapImage("pack://application:,,,/GitHub.App;component/Images/default_org_avatar.png");
@@ -86,7 +86,7 @@ public async Task GetsAvatarFromCache()
             AssertSameImage(expectedImage, retrieved);
         }
 
-        [STAFact]
+        [Fact]
         public async Task RetrievesGitHubAvatar()
         {
             var expectedImage = AvatarProvider.CreateBitmapImage("pack://application:,,,/GitHub.App;component/Images/default_org_avatar.png");
diff --git a/src/UnitTests/GitHub.UI/TwoFactorInputTests.cs b/src/UnitTests/GitHub.UI/TwoFactorInputTests.cs
@@ -9,7 +9,9 @@ public class TwoFactorInputTests
 {
     public class TheTextProperty : TestBaseClass
     {
+#if !NCRUNCH
         [STAFact]
+#endif
         public void SetsTextBoxesToIndividualCharacters()
         {
             var twoFactorInput = new TwoFactorInput();
@@ -26,7 +28,9 @@ public void SetsTextBoxesToIndividualCharacters()
             Assert.Equal("5", textBoxes[5].Text);
         }
 
+#if !NCRUNCH
         [STAFact]
+#endif
         public void IgnoresNonDigitCharacters()
         {
             var twoFactorInput = new TwoFactorInput();
@@ -43,7 +47,9 @@ public void IgnoresNonDigitCharacters()
             Assert.Equal("5", textBoxes[5].Text);
         }
 
+#if !NCRUNCH
         [STAFact]
+#endif
         public void HandlesNotEnoughCharacters()
         {
             var twoFactorInput = new TwoFactorInput();
@@ -60,7 +66,9 @@ public void HandlesNotEnoughCharacters()
             Assert.Equal("", textBoxes[5].Text);
         }
 
+#if !NCRUNCH
         [STATheory]
+#endif
         [InlineData(null, null)]
         [InlineData("", "")]
         [InlineData("xxxx", "")]
diff --git a/src/UnitTests/UnitTests.v3.ncrunchproject b/src/UnitTests/UnitTests.v3.ncrunchproject
@@ -0,0 +1,21 @@
+﻿<ProjectConfiguration>
+  <Settings>
+    <DefaultTestTimeout>2000</DefaultTestTimeout>
+    <HiddenComponentWarnings>
+      <Value>AbnormalReferenceResolution</Value>
+    </HiddenComponentWarnings>
+    <IgnoredTests>
+      <FixtureTestSelector>
+        <FixtureName>SimpleRepositoryModelTests</FixtureName>
+      </FixtureTestSelector>
+      <FixtureTestSelector>
+        <FixtureName>UIControllerTests+PullRequestsFlow</FixtureName>
+      </FixtureTestSelector>
+      <FixtureTestSelector>
+        <FixtureName>UIProviderTests</FixtureName>
+      </FixtureTestSelector>
+    </IgnoredTests>
+    <PreloadReferencedAssemblies>True</PreloadReferencedAssemblies>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/submodules/akavache b/submodules/akavache
@@ -1 +1 @@
-Subproject commit 056ec2af1755be7672fda176ad6c697ee22e579b
+Subproject commit 719a92b2a3f2f94d24cd767203fff695ad7a0839
diff --git a/submodules/reactiveui b/submodules/reactiveui
@@ -1 +1 @@
-Subproject commit debdcac3bde5b754d0a53c3c4d6b27b0fc75412f
+Subproject commit 85e05b16bdcd01b0fb5ea84b76bcb1069d8c7037
diff --git a/submodules/rothko b/submodules/rothko
@@ -1 +1 @@
-Subproject commit f5fe295b120626dae67570095df7f500a65c4850
+Subproject commit ff23501d91c9bca3cf7ab40848ba25eeee47d188
