Merge branch 'master' into fixes/secure-keychain-adapter

Author: shana

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -175,7 +175,7 @@ public void IncrementLaunchCount()
 
         public static void SetMetricsService(IMetricsService instance)
         {
-            Logger.Trace("SetMetricsService instance:{1}", instance?.ToString() ?? "Null");
+            Logger.Trace("SetMetricsService instance:{0}", instance?.ToString() ?? "Null");
             metricsService = instance;
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.v3.ncrunchproject

@@ -3,6 +3,7 @@
     <HiddenComponentWarnings>
       <Value>PostBuildEventDisabled</Value>
     </HiddenComponentWarnings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>

src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.v3.ncrunchproject

@@ -1,6 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <HiddenComponentWarnings />
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>

src/tests/IntegrationTests/IntegrationTests.csproj

@@ -98,10 +98,6 @@
       <Project>{66a1d219-f61d-4ae4-9bd7-aaeb97276fff}</Project>
       <Name>TestUtils</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)src\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.csproj">
-      <Project>{add7a18b-dd2a-4c22-a2c1-488964eff30a}</Project>
-      <Name>GitHub.Unity</Name>
-    </ProjectReference>
     <Reference Include="sfw.net">
       <HintPath>$(SolutionDir)\lib\sfw.net\$(Configuration)\sfw.net.dll</HintPath>
       <Private>True</Private>

src/tests/TestUtils/TestUtils.csproj

@@ -76,10 +76,6 @@
       <Project>{bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0}</Project>
       <Name>GitHub.Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.csproj">
-      <Project>{add7a18b-dd2a-4c22-a2c1-488964eff30a}</Project>
-      <Name>GitHub.Unity</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/tests/UnitTests/UnitTests.csproj

@@ -117,10 +117,6 @@
       <Project>{66a1d219-f61d-4ae4-9bd7-aaeb97276fff}</Project>
       <Name>TestUtils</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\src\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.csproj">
-      <Project>{add7a18b-dd2a-4c22-a2c1-488964eff30a}</Project>
-      <Name>GitHub.Unity</Name>
-    </ProjectReference>
     <Reference Include="sfw.net">
       <HintPath>$(SolutionDir)\lib\sfw.net\$(Configuration)\sfw.net.dll</HintPath>
       <Private>True</Private>