housekeeping: remove netstandard/monoandroid/uwp from tests

reactiveui · Oct 13, 2020 · 052b859 · 052b859
1 parent 6474e1d
commit 052b859
Show file tree

Hide file tree

Showing 27 changed files with 209 additions and 51 deletions.
diff --git a/src/Splat.Drawing/Properties/AssemblyInfo.cs b/src/Splat.Drawing/Properties/AssemblyInfo.cs
@@ -8,3 +8,5 @@
 
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: InternalsVisibleTo("Splat.Tests")]
+[assembly: InternalsVisibleTo("Splat.TestRunner.Android")]
+[assembly: InternalsVisibleTo("Splat.TestRunner.Uwp")]
diff --git a/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj b/src/Splat.TestRunner.Android/Splat.TestRunner.Android.csproj
@@ -21,13 +21,14 @@
     <CopyNuGetImplementations>true</CopyNuGetImplementations>
     <NoStdLib>false</NoStdLib>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000;CA1034</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
@@ -43,7 +44,7 @@
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -100,23 +101,54 @@
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Splat.Tests\**\*.cs" LinkBase="..\Splat.Tests" Exclude="**\*AssemblyInfo.cs;**/obj/**/*" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
       <Version>4.*</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.devices">
       <Version>2.*</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Serilog.Exceptions" Version="5.6.0" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Splat.AppCenter\Splat.AppCenter.csproj">
+      <Project>{dca3c3b2-dbd1-4c92-ac3b-4de6fad598a3}</Project>
+      <Name>Splat.AppCenter</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.ApplicationInsights\Splat.ApplicationInsights.csproj">
+      <Project>{2ed64333-8b11-461e-a009-fffbfe4bd0d9}</Project>
+      <Name>Splat.ApplicationInsights</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Splat.Drawing\Splat.Drawing.csproj">
       <Project>{694d2813-14ff-456a-b1e7-c5bb82aee400}</Project>
       <Name>Splat.Drawing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Splat.Tests\Splat.Tests.csproj">
-      <Project>{6cad2584-aa69-4a36-8ad4-a90d040003ca}</Project>
-      <Name>Splat.Tests</Name>
+    <ProjectReference Include="..\Splat.Exceptionless\Splat.Exceptionless.csproj">
+      <Project>{33e4d5f9-b95e-4ae6-a874-7f4a40b2005e}</Project>
+      <Name>Splat.Exceptionless</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Log4Net\Splat.Log4Net.csproj">
+      <Project>{d65c61d8-c073-4761-9ba3-c595a079c42e}</Project>
+      <Name>Splat.Log4Net</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Microsoft.Extensions.Logging\Splat.Microsoft.Extensions.Logging.csproj">
+      <Project>{898c7105-00af-45ec-948a-d004bcc01eb6}</Project>
+      <Name>Splat.Microsoft.Extensions.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.NLog\Splat.NLog.csproj">
+      <Project>{24bcc71a-0998-4b81-9a55-bc00c2a3f8ce}</Project>
+      <Name>Splat.NLog</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Raygun\Splat.Raygun.csproj">
+      <Project>{a587ef52-4a3f-4375-a335-9ed7c6d410cb}</Project>
+      <Name>Splat.Raygun</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Serilog\Splat.Serilog.csproj">
+      <Project>{75538893-9968-45f1-9c05-edb837fe0cfe}</Project>
+      <Name>Splat.Serilog</Name>
     </ProjectReference>
     <ProjectReference Include="..\Splat\Splat.csproj">
       <Project>{8535bde3-25b5-41d6-bf5d-2df766ae879b}</Project>

diff --git a/src/Splat.TestRunner.Uwp/Splat.TestRunner.Uwp.csproj b/src/Splat.TestRunner.Uwp/Splat.TestRunner.Uwp.csproj
@@ -18,12 +18,12 @@
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000;CA1034;2008</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -34,7 +34,6 @@
     <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -46,7 +45,6 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -57,7 +55,6 @@
     <OutputPath>bin\ARM\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -69,7 +66,6 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -81,7 +77,6 @@
     <OutputPath>bin\ARM64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>ARM64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -93,7 +88,6 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -104,7 +98,6 @@
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -139,30 +132,63 @@
     <Content Include="Assets\StoreLogo.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Splat.Tests\**\*.cs" LinkBase="..\Splat.Tests" Exclude="**\*AssemblyInfo.cs;**/obj/**/*" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.9</Version>
     </PackageReference>
-     <PackageReference Include="MSTest.TestAdapter">
+    <PackageReference Include="MSTest.TestAdapter">
       <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
       <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.devices">
       <Version>2.5.25</Version>
-    </PackageReference>    
+    </PackageReference>
+    <PackageReference Include="Serilog.Exceptions" Version="5.6.0" />
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
-  </ItemGroup>  
+  </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Splat.AppCenter\Splat.AppCenter.csproj">
+      <Project>{dca3c3b2-dbd1-4c92-ac3b-4de6fad598a3}</Project>
+      <Name>Splat.AppCenter</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.ApplicationInsights\Splat.ApplicationInsights.csproj">
+      <Project>{2ed64333-8b11-461e-a009-fffbfe4bd0d9}</Project>
+      <Name>Splat.ApplicationInsights</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Log4Net\Splat.Log4Net.csproj">
+      <Project>{d65c61d8-c073-4761-9ba3-c595a079c42e}</Project>
+      <Name>Splat.Log4Net</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Microsoft.Extensions.Logging\Splat.Microsoft.Extensions.Logging.csproj">
+      <Project>{898c7105-00af-45ec-948a-d004bcc01eb6}</Project>
+      <Name>Splat.Microsoft.Extensions.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.NLog\Splat.NLog.csproj">
+      <Project>{24bcc71a-0998-4b81-9a55-bc00c2a3f8ce}</Project>
+      <Name>Splat.NLog</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Raygun\Splat.Raygun.csproj">
+      <Project>{a587ef52-4a3f-4375-a335-9ed7c6d410cb}</Project>
+      <Name>Splat.Raygun</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Splat.Serilog\Splat.Serilog.csproj">
+      <Project>{75538893-9968-45f1-9c05-edb837fe0cfe}</Project>
+      <Name>Splat.Serilog</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Splat\Splat.csproj">
       <Project>{8535bde3-25b5-41d6-bf5d-2df766ae879b}</Project>
       <Name>Splat</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Splat.Tests\Splat.Tests.csproj">
-      <Name>Splat.Tests</Name>
+    <ProjectReference Include="..\Splat.Drawing\Splat.Drawing.csproj">
+      <Project>{694d2813-14ff-456a-b1e7-c5bb82aee400}</Project>
+      <Name>Splat.Drawing</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
@@ -178,7 +204,6 @@
   -->
   <!-- Allow building from command line MSBuild workaround. -->
   <Target Name="Pack" />
-
   <Target Name="AddXunitTestAdapterLibs" AfterTargets="AddXunitTestAdapterLibs" BeforeTargets="_GenerateAppxManifest">
   </Target>
 </Project>
diff --git a/src/Splat.Tests/API/ApiApprovalTests.cs b/src/Splat.Tests/API/ApiApprovalTests.cs
@@ -3,6 +3,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
+#if !WINDOWS_UWP && !ANDROID
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -87,3 +89,5 @@ private static string Filter(string text)
         }
     }
 }
+
+#endif
diff --git a/...Splat.Tests/ApplicationPerformanceMonitoring/AppCenterFeatureUsageTrackingSessionTests.cs b/...Splat.Tests/ApplicationPerformanceMonitoring/AppCenterFeatureUsageTrackingSessionTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Xunit;

diff --git a/src/Splat.Tests/ApplicationPerformanceMonitoring/AppCenterViewTrackingTests.cs b/src/Splat.Tests/ApplicationPerformanceMonitoring/AppCenterViewTrackingTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 

diff --git a/...s/ApplicationPerformanceMonitoring/ApplicationInsightsFeatureUsageTrackingSessionTests.cs b/...s/ApplicationPerformanceMonitoring/ApplicationInsightsFeatureUsageTrackingSessionTests.cs
@@ -1,4 +1,9 @@
-#if !WINDOWS_UWP
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+#if !WINDOWS_UWP
 
 using System;
 using System.Collections.Generic;

diff --git a/src/Splat.Tests/ApplicationPerformanceMonitoring/ApplicationInsightsViewTrackingTests.cs b/src/Splat.Tests/ApplicationPerformanceMonitoring/ApplicationInsightsViewTrackingTests.cs
@@ -1,4 +1,9 @@
-#if !WINDOWS_UWP
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+#if !WINDOWS_UWP
 
 using System;
 using System.Collections.Generic;

diff --git a/src/Splat.Tests/ApplicationPerformanceMonitoring/BaseFeatureUsageTrackingTests.cs b/src/Splat.Tests/ApplicationPerformanceMonitoring/BaseFeatureUsageTrackingTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Splat.ApplicationPerformanceMonitoring;

diff --git a/src/Splat.Tests/ApplicationPerformanceMonitoring/BaseViewTrackingTests.cs b/src/Splat.Tests/ApplicationPerformanceMonitoring/BaseViewTrackingTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Splat.ApplicationPerformanceMonitoring;

diff --git a/...Splat.Tests/ApplicationPerformanceMonitoring/EnableFeatureUsageTrackingExtensionsTests.cs b/...Splat.Tests/ApplicationPerformanceMonitoring/EnableFeatureUsageTrackingExtensionsTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Splat.ApplicationPerformanceMonitoring;

diff --git a/...t.Tests/ApplicationPerformanceMonitoring/ExceptionlessFeatureUsageTrackingSessionTests.cs b/...t.Tests/ApplicationPerformanceMonitoring/ExceptionlessFeatureUsageTrackingSessionTests.cs
@@ -1,4 +1,9 @@
-#if !WINDOWS_UWP && !ANDROID
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+#if !WINDOWS_UWP && !ANDROID
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/src/Splat.Tests/ApplicationPerformanceMonitoring/RaygunFeatureUsageTrackingSessionTests.cs b/src/Splat.Tests/ApplicationPerformanceMonitoring/RaygunFeatureUsageTrackingSessionTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Mindscape.Raygun4Net;

diff --git a/src/Splat.Tests/BitmapLoaderTests.cs b/src/Splat.Tests/BitmapLoaderTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

diff --git a/src/Splat.Tests/Colors/KnownColorTests.cs b/src/Splat.Tests/Colors/KnownColorTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Xunit;

diff --git a/src/Splat.Tests/Colors/SplatColorTests.cs b/src/Splat.Tests/Colors/SplatColorTests.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/src/Splat.Tests/Logging/BaseTests/AllocationFreeLoggerBaseTestBase.cs b/src/Splat.Tests/Logging/BaseTests/AllocationFreeLoggerBaseTestBase.cs
@@ -1,4 +1,9 @@
-using System;
+// Copyright (c) 2019 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Xunit;