Merge branch 'master' into fixes/1666-filter-pr-solution-explorer

jcansdale · web-flow · commit da6ef3ef71f8 · 2018-05-18T16:39:14.000+01:00
diff --git a/src/GitHub.Exports/Properties/AssemblyInfo.cs b/src/GitHub.Exports/Properties/AssemblyInfo.cs
@@ -5,4 +5,3 @@
 [assembly: AssemblyTitle("GitHub.Exports")]
 [assembly: AssemblyDescription("GitHub interfaces for mef exports")]
 [assembly: Guid("9aea02db-02b5-409c-b0ca-115d05331a6b")]
-[assembly: InternalsVisibleTo("MetricsTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1a49bb6a01873a4e5434cbaa9993f5a75d3ba66fecfff4d85066c7094913d43f6f9bb706d2eb65f4990a7adfe7321e120ba8be5a8367fc5551c0a6eeb4850c5646377d314142abe69a5fb8ec0957a63ba5893901adb5b4cf0eb7f7e5861376e0cb4fd975576094b2fb4843df9c186eb17232365291b93e17f5e2b6cc1cda2c2")]
diff --git a/src/GitHub.Exports/Services/MetricsService.cs b/src/GitHub.Exports/Services/MetricsService.cs
@@ -99,14 +99,15 @@ public Task SendOptIn()
              */
         }
 
-        internal static StringContent SerializeRequest(UsageModel model)
+        public static StringContent SerializeRequest(UsageModel model)
         {
             var serializer = new SimpleJsonSerializer();
             var dictionary = new Dictionary<string, object>
             {
                 {ToJsonPropertyName("Dimensions"), ToModelDictionary(model.Dimensions) },
                 {ToJsonPropertyName("Measures"), ToModelDictionary(model.Measures) }
             };
+
             return new StringContent(serializer.Serialize(dictionary), Encoding.UTF8, "application/json");
         }
 
diff --git a/test/MetricsTests/MetricsServer/MetricsServer.csproj b/test/MetricsTests/MetricsServer/MetricsServer.csproj
@@ -39,10 +39,11 @@
     <StartupObject />
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Nancy, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -75,7 +76,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -85,13 +85,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\packages\StrongNamer.0.0.6\build\StrongNamer.targets" Condition="Exists('..\..\..\packages\StrongNamer.0.0.6\build\StrongNamer.targets')" />
-  <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\StrongNamer.0.0.6\build\StrongNamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\StrongNamer.0.0.6\build\StrongNamer.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/MetricsTests/MetricsServer/key.snk b/test/MetricsTests/MetricsServer/key.snk
diff --git a/test/MetricsTests/MetricsServer/packages.config b/test/MetricsTests/MetricsServer/packages.config
@@ -2,5 +2,4 @@
 <packages>
   <package id="Nancy" version="1.4.1" targetFramework="net461" />
   <package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net461" />
-  <package id="StrongNamer" version="0.0.6" targetFramework="net461" />
 </packages>
diff --git a/test/MetricsTests/MetricsTests/MetricsTests.csproj b/test/MetricsTests/MetricsTests/MetricsTests.csproj
@@ -39,10 +39,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
@@ -69,7 +70,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test/MetricsTests/MetricsTests/key.snk b/test/MetricsTests/MetricsTests/key.snk

Original file line number	Diff line number	Diff line change
`@@ -99,14 +99,15 @@ public Task SendOptIn()`
`99`	`99`	`*/`
`100`	`100`	`}`
`101`	`101`
`102`		`- internal static StringContent SerializeRequest(UsageModel model)`
	`102`	`+ public static StringContent SerializeRequest(UsageModel model)`
`103`	`103`	`{`
`104`	`104`	`var serializer = new SimpleJsonSerializer();`
`105`	`105`	`var dictionary = new Dictionary<string, object>`
`106`	`106`	`{`
`107`	`107`	`{ToJsonPropertyName("Dimensions"), ToModelDictionary(model.Dimensions) },`
`108`	`108`	`{ToJsonPropertyName("Measures"), ToModelDictionary(model.Measures) }`
`109`	`109`	`};`
	`110`	`+`
`110`	`111`	`return new StringContent(serializer.Serialize(dictionary), Encoding.UTF8, "application/json");`
`111`	`112`	`}`
`112`	`113`