Browse Source

Add Testing library

Oren Novotny 8 years ago
parent
commit
36628232c9

+ 60 - 0
Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj

@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <TargetFrameworks>net45;net46;netstandard1.3;uap10.0</TargetFrameworks>    
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinClientVersion>2.12</MinClientVersion>
+    <Description>Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.</Description>
+    <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
+    <AssemblyTitle>Microsoft.Reactive.Testing - Testing Helper Library</AssemblyTitle>
+    <Authors>.NET Foundation and Contributors</Authors>
+    <DefineConstants>$(DefineConstants);PLATFORM_DOTNET;XUNIT_VISIBILITY_INTERNAL</DefineConstants>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
+    <Product>Microsoft.Reactive.Testing ($(TargetFramework))</Product>
+    <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</PackageIconUrl>
+    <PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</PackageProjectUrl>
+    <PackageLicenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <IncludeSymbols>true</IncludeSymbols>
+    <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
+    <Description>Reactive Extensions (Rx) for .NET - Testing Library</Description>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
+    <AssemblyVersion>4.0.3000.0</AssemblyVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
+    <AssemblyVersion>4.0.1000.0</AssemblyVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46</DefineConstants>
+    <AssemblyVersion>4.0.3000.0</AssemblyVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>    
+    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS</DefineConstants>
+    <AssemblyVersion>4.0.4000.0</AssemblyVersion>    
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <EmbeddedResource Include="**\*.resx" />
+    <EmbeddedResource Include="Properties\*.xml" />
+    <PackageReference Include="GitVersionTask" Version="4.0.0-pullrequest1119-1208">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.assert.source" Version="2.2.0-beta4-build3444" />    
+    <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
+  </ItemGroup>
+</Project>

+ 0 - 18
Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.xproj

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a0fa7fb5-bc2b-4e9f-9807-40bc26894ad5</ProjectGuid>
-    <RootNamespace>Microsoft.Reactive.Testing</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

+ 4 - 21
Rx.NET/Source/Microsoft.Reactive.Testing/Properties/AssemblyInfo.cs

@@ -1,26 +1,9 @@
 using System;
 using System;
-using System.Reflection;
-using System.Resources;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 
-[assembly: AssemblyTitle("Microsoft.Reactive.Testing")]
-[assembly: AssemblyDescription("Reactive Extensions Testing Library used to write unit tests for queries and custom operators over observable sequences.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Reactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
-[assembly: NeutralResourcesLanguage("en-US")]
 
 
-[assembly: ComVisible(false)]
-
-// ===========================================================================
-//  DO NOT EDIT OR REMOVE ANYTHING BELOW THIS COMMENT.
-//  Version numbers are automatically generated in the msbuild files based on regular expressions 
-// ===========================================================================
 
 
-[assembly: AssemblyFileVersion("2.2.0.0")]
-[assembly: AssemblyInformationalVersion("2.2.0.0")]
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
+[assembly: AllowPartiallyTrustedCallers]

+ 7 - 0
Rx.NET/Source/Microsoft.Reactive.Testing/Properties/Microsoft.Reactive.Testing.rd.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library>
+    <Assembly Name="Microsoft.Reactive.Testing" Dynamic="Required All" />
+    <!-- TODO optimize this for types that actually need reflection -->
+  </Library>
+</Directives>

+ 0 - 215
Rx.NET/Source/Microsoft.Reactive.Testing/project.json

@@ -1,215 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Microsoft.Reactive.Testing - Testing Helper Library",
-  "description": "Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED", "PLATFORM_DOTNET", "XUNIT_VISIBILITY_INTERNAL" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-
-  "dependencies": {
-    "System.Reactive.Linq": { "target": "project" },
-    "System.Reactive.PlatformServices": { "target": "project" },
-    "xunit.assert.source": "2.2.0-beta3-build3316"
-  },
-  
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": ""
-      }
-    },
-    "net46": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_TPL46",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "DESKTOPCLR",
-          "DESKTOPCLR46"
-        ]
-      },
-      "dependencies": {
-      
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": ""
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "NO_CDS_COLLECTIONS",
-          "USE_TIMER_SELF_ROOT",
-          "PLIB"
-        ]
-      },
-      "dependencies": {
-      
-      }
-    },
-    "netstandard1.3": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_TPL46",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "PLIB",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "dependencies": {
-      
-      }
-    },
-    "wpa81": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "USE_TIMER_SELF_ROOT",
-          "WINDOWS",
-          "WINDOWS81"
-        ]
-      },
-      "dependencies": {
-        "Microsoft.TargetingPack.Private.WinRT": {
-          "version": "1.0.1",
-          "type": "build"
-        },
-        "Microsoft.TargetingPack.Private.WindowsPhone.v8.1": {
-          "version": "1.0.1",
-          "type": "build"
-        }
-      }
-    },
-    "netcore451": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "USE_TIMER_SELF_ROOT",
-          "WINDOWS",
-          "WINDOWS81"
-        ]
-      },
-      "dependencies": {
-        "Microsoft.TargetingPack.Private.WinRT": {
-          "version": "1.0.1",
-          "type": "build"
-        },
-        "Microsoft.TargetingPack.Private.NETCore.v4.5.1": {
-          "version": "1.0.0",
-          "type": "build"
-        }
-      }
-    },
-    "uap10.0": {
-      "imports": ["dotnet5.4"],
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_TPL46",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "WINDOWS",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      },
-      "dependencies": {
-        "Microsoft.TargetingPack.Private.WinRT": {
-          "version": "1.0.1",
-          "type": "build"
-        },
-        "Microsoft.NETCore.UniversalWindowsPlatform": {
-          "version": "5.2.0",
-          "type": "build"
-        }
-      }
-    }
-  }
-}

+ 14 - 0
Rx.NET/Source/System.Reactive.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.26014.0
 MinimumVisualStudioVersion = 10.0.40219.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reactive", "System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reactive", "System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
 EndProject
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Reactive.Testing", "Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj", "{73078FB5-6038-4674-B4C4-32FD81B88055}"
+EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,18 @@ Global
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.Build.0 = Release|x64
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.Build.0 = Release|x64
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.ActiveCfg = Release|x86
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.ActiveCfg = Release|x86
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.Build.0 = Release|x86
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.Build.0 = Release|x86
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.ActiveCfg = Debug|x64
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.Build.0 = Debug|x64
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.ActiveCfg = Debug|x86
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.Build.0 = Debug|x86
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.ActiveCfg = Release|x64
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.Build.0 = Release|x64
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.ActiveCfg = Release|x86
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE