diff --git a/.gitignore b/.gitignore index ca6745f0..a5684f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -117,7 +117,7 @@ Generated_Code #added for RIA/Silverlight projects _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML - +UpgradeLog*.htm ############ diff --git a/.vsts.rx.yml b/.vsts.rx.yml new file mode 100644 index 00000000..0e3eaecc --- /dev/null +++ b/.vsts.rx.yml @@ -0,0 +1,27 @@ +queue: + name: Hosted VS2017 + +steps: +- task: BatchScript@1 + inputs: + filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat" + arguments: -no_logo + modifyEnvironment: true + displayName: Setup Environment Variables + +- task: PowerShell@1 + inputs: + scriptName: 'Rx.NET/Source/build-new.ps1' + workingFolder: 'Rx.NET/Source' + env: + VSTS_ACCESS_TOKEN: $(System.AccessToken) + SignClientUser: $(SignClientUser) + SignClientSecret: $(SignClientSecret) + displayName: Build + +- task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: 'Rx.NET/Source/artifacts' + ArtifactName: artifacts + publishLocation: Container + condition: always() \ No newline at end of file diff --git a/Rx.NET/Source/.editorconfig b/Rx.NET/Source/.editorconfig new file mode 100644 index 00000000..2058c2a5 --- /dev/null +++ b/Rx.NET/Source/.editorconfig @@ -0,0 +1,83 @@ +# EditorConfig is awesome:http://EditorConfig.org +# From https://raw.githubusercontent.com/dotnet/roslyn/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Don't use tabs for indentation. +[*] +indent_style = space +# (Please don't specify an indent_size here; that has too many unintended consequences.) + +# Code files +[*.{cs,csx,vb,vbx}] +indent_size = 4 +insert_final_newline = true +charset = utf-8-bom + +# Xml project files +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 + +# Xml config files +[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] +indent_size = 2 + +# JSON files +[*.json] +indent_size = 2 + +# Dotnet code style settings: +[*.{cs,vb}] +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true:suggestion +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +# Use language keywords instead of framework type names for type references +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion + +# Suggest more modern language features when available +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion + +dotnet_style_require_accessibility_modifiers = omit_if_default:suggestion + +# CSharp code style settings: +[*.cs] +# Prefer "var" everywhere +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion + +# Prefer method-like constructs to have a block body +csharp_style_expression_bodied_methods = false:none +csharp_style_expression_bodied_constructors = false:none +csharp_style_expression_bodied_operators = false:none + +# Prefer property-like constructs to have an expression-body +csharp_style_expression_bodied_properties = true:none +csharp_style_expression_bodied_indexers = true:none +csharp_style_expression_bodied_accessors = true:none + +# Suggest more modern language features when available +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion + +# Newline settings +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index c1de9ce1..9fed1d9b 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -19,30 +19,12 @@ $(MSBuildThisFileDirectory)Rx.ruleset - - - - - - - - - - 2.0.41 - + + - + - - - - - diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index 430b62b8..2a4bef96 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -18,9 +18,4 @@ $(DefineConstants);HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING - - - - - \ No newline at end of file diff --git a/Rx.NET/Source/System.Reactive.sln b/Rx.NET/Source/System.Reactive.sln index c939d939..c9e5538a 100644 --- a/Rx.NET/Source/System.Reactive.sln +++ b/Rx.NET/Source/System.Reactive.sln @@ -30,8 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Facades", "Facades", "{A0F3 facades\System.Reactive.Compatibility.nuspec = facades\System.Reactive.Compatibility.nuspec EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Interfaces", "facades\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj", "{3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Core", "facades\System.Reactive.Core\System.Reactive.Core.csproj", "{296C5140-7945-439D-B090-AB6250DEEE51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Experimental", "facades\System.Reactive.Experimental\System.Reactive.Experimental.csproj", "{3EEB4F40-002A-4F72-9DDF-8E6FE3847B82}" @@ -50,6 +48,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Windows.Thr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.WindowsRuntime", "facades\System.Reactive.WindowsRuntime\System.Reactive.WindowsRuntime.csproj", "{E9BB350B-D4EF-42E1-B4E2-14058AC6809B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Interfaces", "src\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj", "{095215B0-7911-4996-83B5-F21EAA2513F4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -148,22 +148,6 @@ Global {10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.ActiveCfg = Release|x86 {10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.Build.0 = Release|x86 {10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.Deploy.0 = Release|x86 - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|ARM.Build.0 = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|x64.ActiveCfg = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|x64.Build.0 = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|x86.ActiveCfg = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Debug|x86.Build.0 = Debug|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|Any CPU.Build.0 = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|ARM.ActiveCfg = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|ARM.Build.0 = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|x64.ActiveCfg = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|x64.Build.0 = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|x86.ActiveCfg = Release|Any CPU - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1}.Release|x86.Build.0 = Release|Any CPU {296C5140-7945-439D-B090-AB6250DEEE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {296C5140-7945-439D-B090-AB6250DEEE51}.Debug|Any CPU.Build.0 = Debug|Any CPU {296C5140-7945-439D-B090-AB6250DEEE51}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -308,6 +292,22 @@ Global {E9BB350B-D4EF-42E1-B4E2-14058AC6809B}.Release|x64.Build.0 = Release|Any CPU {E9BB350B-D4EF-42E1-B4E2-14058AC6809B}.Release|x86.ActiveCfg = Release|Any CPU {E9BB350B-D4EF-42E1-B4E2-14058AC6809B}.Release|x86.Build.0 = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|ARM.Build.0 = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|x64.ActiveCfg = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|x64.Build.0 = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|x86.ActiveCfg = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Debug|x86.Build.0 = Debug|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|Any CPU.Build.0 = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|ARM.ActiveCfg = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|ARM.Build.0 = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|x64.ActiveCfg = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|x64.Build.0 = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|x86.ActiveCfg = Release|Any CPU + {095215B0-7911-4996-83B5-F21EAA2513F4}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -315,7 +315,6 @@ Global GlobalSection(NestedProjects) = preSolution {E072D663-A241-4FEC-B888-45640F69D9CE} = {D324579D-CBE6-4867-8980-D7842C7C45A2} {10CC7191-D936-46CA-BA87-0646733571EA} = {D324579D-CBE6-4867-8980-D7842C7C45A2} - {3AAA3D7D-1342-48F2-9562-52E4ABAF69E1} = {A0F39260-B8F8-4FCB-9679-0ED917A22BDF} {296C5140-7945-439D-B090-AB6250DEEE51} = {A0F39260-B8F8-4FCB-9679-0ED917A22BDF} {3EEB4F40-002A-4F72-9DDF-8E6FE3847B82} = {A0F39260-B8F8-4FCB-9679-0ED917A22BDF} {68B8D2CD-BB8F-4033-90B0-C282304C2B2B} = {A0F39260-B8F8-4FCB-9679-0ED917A22BDF} diff --git a/Rx.NET/Source/System.Reactive.sln.DotSettings b/Rx.NET/Source/System.Reactive.sln.DotSettings deleted file mode 100644 index e399b944..00000000 --- a/Rx.NET/Source/System.Reactive.sln.DotSettings +++ /dev/null @@ -1,216 +0,0 @@ - - True - SUGGESTION - SUGGESTION - SUGGESTION - <?xml version="1.0" encoding="utf-16"?><Profile name="NoReordering"><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><HtmlReformatCode>True</HtmlReformatCode><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><JsInsertSemicolon>True</JsInsertSemicolon><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><RelativePathStyleTs>True</RelativePathStyleTs><XMLReformatCode>True</XMLReformatCode><CppReformatCode>True</CppReformatCode><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><VBOptimizeImports>True</VBOptimizeImports><VBShortenReferences>True</VBShortenReferences><VBReformatCode>True</VBReformatCode><VBFormatDocComments>True</VBFormatDocComments><CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="False" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /></Profile> - <?xml version="1.0" encoding="utf-16"?><Profile name="Normal"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSUpdateFileHeader>False</CSUpdateFileHeader><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_IMPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSReorderTypeMembers>True</CSReorderTypeMembers><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><XMLReformatCode>True</XMLReformatCode><JsReformatCode>True</JsReformatCode><JsInsertSemicolon>True</JsInsertSemicolon><VBReformatCode>True</VBReformatCode><VBShortenReferences>True</VBShortenReferences><VBOptimizeImports>True</VBOptimizeImports><HtmlReformatCode>True</HtmlReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsFormatDocComments>True</JsFormatDocComments><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><CppReformatCode>True</CppReformatCode><VBFormatDocComments>True</VBFormatDocComments><CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="False" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /></Profile> - Default: Full Cleanup - NoReordering - True - Explicit - Explicit - True - True - True - True - True - True - True - True - True - True - True - False - False - False - CHOP_IF_LONG - CHOP_ALWAYS - 160 - False - CHOP_ALWAYS - CHOP_ALWAYS - CHOP_IF_LONG - <?xml version="1.0" encoding="utf-16"?> -<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> - <TypePattern DisplayName="COM interfaces or structs"> - <TypePattern.Match> - <Or> - <And> - <Kind Is="Interface" /> - <Or> - <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> - <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> - </Or> - </And> - <Kind Is="Struct" /> - </Or> - </TypePattern.Match> - </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="Default Pattern" RemoveRegions="AllExceptGenerated"> - <Entry Priority="100" DisplayName="Public Delegates"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Delegate" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry Priority="100" DisplayName="Public Enums"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Enum" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Static Fields and Constants"> - <Entry.Match> - <Or> - <Kind Is="Constant" /> - <And> - <Kind Is="Field" /> - <Static /> - </And> - </Or> - </Entry.Match> - <Entry.SortBy> - <Kind Order="Constant Field" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Fields"> - <Entry.Match> - <And> - <Kind Is="Field" /> - <Not> - <Static /> - </Not> - </And> - </Entry.Match> - <Entry.SortBy> - <Readonly /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Constructors"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - <Entry.SortBy> - <Static /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Properties, Indexers"> - <Entry.Match> - <Or> - <Kind Is="Property" /> - <Kind Is="Indexer" /> - </Or> - </Entry.Match> - <Entry.SortBy> - <Readonly /> - <Access /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry Priority="100" DisplayName="Interface Implementations"> - <Entry.Match> - <And> - <Kind Is="Member" /> - <ImplementsInterface /> - </And> - </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="True" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="All other members"> - <Entry.SortBy> - <Access /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Nested Types"> - <Entry.Match> - <Kind Is="Type" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> -</Patterns> - System - System.Collections.Generic - System.Linq - System.Text - System.Threading.Tasks - System - System.Collections.Generic - System.Linq - System.Threading.Tasks - // Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - True - False - True - True - True - True - True - Automatic property - False - True - False - False - FAKEPROPERTY - IP - RT - <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="Contract" Style="AaBb" /></Policy> - True - True - True - True \ No newline at end of file diff --git a/Rx.NET/Source/System.Reactive.v3.ncrunchsolution b/Rx.NET/Source/System.Reactive.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/Rx.NET/Source/System.Reactive.v3.ncrunchsolution +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/build-new.ps1 b/Rx.NET/Source/build-new.ps1 index 06418431..f2a62c94 100644 --- a/Rx.NET/Source/build-new.ps1 +++ b/Rx.NET/Source/build-new.ps1 @@ -2,7 +2,7 @@ $scriptPath = split-path -parent $MyInvocation.MyCommand.Definition $configuration = "Release" -$isAppVeyor = Test-Path -Path env:\APPVEYOR +$isAppVeyor = ((Test-Path -Path env:\APPVEYOR) -Or (Test-Path -Path env:\TF_BUILD)) $outputLocation = Join-Path $scriptPath "testResults" $openCoverPath = ".\packages\OpenCover\tools\OpenCover.Console.exe" $xUnitConsolePath = ".\packages\xunit.runner.console\tools\net452\xunit.console.exe" @@ -25,9 +25,9 @@ if (!(Test-Path .\nuget.exe)) { } # get tools -.\nuget.exe install -excludeversion SignClient -Version 0.9.0 -outputdirectory packages -.\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -pre -outputdirectory packages -.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.0.41 -outputdirectory packages +.\nuget.exe install -excludeversion SignClient -Version 0.9.1 -outputdirectory packages +.\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -version 2017.3.5 -outputdirectory packages +.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.1.23 -outputdirectory packages .\nuget.exe install -excludeversion xunit.runner.console -outputdirectory packages #.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages @@ -42,14 +42,8 @@ Write-Host "Building $packageSemVer" -Foreground Green New-Item -ItemType Directory -Force -Path $artifacts -Write-Host "Restoring packages for $scriptPath\System.Reactive.sln" -Foreground Green -msbuild "$scriptPath\System.Reactive.sln" /m /t:restore /p:Configuration=$configuration - -# Force a restore again to get proper version numbers https://github.com/NuGet/Home/issues/4337 -msbuild "$scriptPath\System.Reactive.sln" /m /t:restore /p:Configuration=$configuration - Write-Host "Building $scriptPath\System.Reactive.sln" -Foreground Green -msbuild "$scriptPath\System.Reactive.sln" /t:build /m /p:Configuration=$configuration +msbuild "$scriptPath\System.Reactive.sln" /restore /t:build /m /p:Configuration=$configuration /bl:.\artifacts\build.binlog /p:RestoreAdditionalProjectFallbackFolders="" if ($LastExitCode -ne 0) { Write-Host "Error with build" -Foreground Red if($isAppVeyor) { @@ -60,13 +54,13 @@ if ($LastExitCode -ne 0) { Write-Host "Building Packages" -Foreground Green +msbuild "$scriptPath\src\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\src\System.Reactive\System.Reactive.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\facades\System.Reactive.Core\System.Reactive.Core.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\facades\System.Reactive.Experimental\System.Reactive.Experimental.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true -msbuild "$scriptPath\facades\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\facades\System.Reactive.Linq\System.Reactive.Linq.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\facades\System.Reactive.PlatformServices\System.Reactive.PlatformServices.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true msbuild "$scriptPath\facades\System.Reactive.Providers\System.Reactive.Providers.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true @@ -100,15 +94,14 @@ if($hasSignClientSecret) { Write-Host "Client Secret not found, not signing packages" } - Write-Host "Running tests" -Foreground Green $testDirectory = Join-Path $scriptPath "tests\Tests.System.Reactive" # OpenCover isn't working currently. So run tests on CI and coverage with JetBrains -# Use xUnit CLI as it's significantly faster than vstest (dotnet test) $dotnet = "$env:ProgramFiles\dotnet\dotnet.exe" -.\packages\JetBrains.dotCover.CommandLineTools\tools\dotCover.exe analyse /targetexecutable="$dotnet" /targetworkingdir="$testDirectory" /targetarguments="xunit -c $configuration --no-build -notrait `"SkipCI=true`"" /Filters="+:module=System.Reactive;+:module=Microsoft.Reactive.Testing;+:module=System.Reactive.Observable.Aliases;-:type=Xunit*" /DisableDefaultFilters /ReturnTargetExitCode /AttributeFilters="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" /Output="$outputFile" /ReportType=DetailedXML /HideAutoProperties +.\packages\JetBrains.dotCover.CommandLineTools\tools\dotCover.exe analyse /targetexecutable="$dotnet" /targetworkingdir="$testDirectory" /targetarguments="test -c $configuration --no-build --no-restore --filter `"SkipCI!=true`"" /Filters="+:module=System.Reactive;+:module=Microsoft.Reactive.Testing;+:module=System.Reactive.Observable.Aliases;-:type=Xunit*" /DisableDefaultFilters /ReturnTargetExitCode /AttributeFilters="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" /Output="$outputFile" /ReportType=DetailedXML /HideAutoProperties +#dotnet test $testDirectory --no-build --no-restore -c "Release" --filter "SkipCI!=true" if ($LastExitCode -ne 0) { Write-Host "Error with tests" -Foreground Red @@ -119,7 +112,7 @@ if ($LastExitCode -ne 0) { } # Either display or publish the results -if ($env:CI -eq 'True') +if ($isAppVeyor -eq 'True') { .\packages\coveralls.io.dotcover\tools\coveralls.net.exe -f -p DotCover "$outputFile" } diff --git a/Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec b/Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec index 05be18b3..d705571c 100644 --- a/Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec +++ b/Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec @@ -17,7 +17,6 @@ - @@ -25,7 +24,6 @@ - @@ -35,7 +33,6 @@ - diff --git a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj b/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj index f6cade68..dc4829e7 100644 --- a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj +++ b/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj @@ -1,4 +1,4 @@ - + net45;net46;netstandard1.3;uap10.0;netcoreapp1.0 @@ -8,6 +8,4 @@ - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Experimental/System.Reactive.Experimental.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Experimental/System.Reactive.Experimental.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Experimental/System.Reactive.Experimental.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Interfaces/TypeForwarders.Interfaces.cs b/Rx.NET/Source/facades/System.Reactive.Interfaces/TypeForwarders.Interfaces.cs deleted file mode 100644 index 8c7d881a..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Interfaces/TypeForwarders.Interfaces.cs +++ /dev/null @@ -1,18 +0,0 @@ -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.IEventPatternSource<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.IEventPattern<,>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.IEventSource<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.IObserver<,>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.IScheduledItem<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.IScheduler))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.ISchedulerLongRunning))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.ISchedulerPeriodic))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.IStopwatch))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Concurrency.IStopwatchProvider))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Disposables.ICancelable))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Linq.IGroupedObservable<,>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Linq.IQbservable))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Linq.IQbservableProvider))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Linq.IQbservable<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Subjects.IConnectableObservable<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Subjects.ISubject<>))] -[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reactive.Subjects.ISubject<,>))] diff --git a/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj b/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj index c8b7a0e5..b71eb36d 100644 --- a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj +++ b/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj @@ -1,4 +1,4 @@ - + net45;net46;netstandard1.3;netcoreapp1.0;uap10.0 @@ -8,6 +8,4 @@ - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj b/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj index 4c550b2a..1de02a8c 100644 --- a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj +++ b/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj @@ -1,4 +1,4 @@ - + net45;uap10.0 @@ -7,7 +7,5 @@ - - - + \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.v3.ncrunchproject deleted file mode 100644 index a4953e14..00000000 --- a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.v3.ncrunchproject +++ /dev/null @@ -1,6 +0,0 @@ - - - True - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj b/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj index 36b71a8e..11306c4e 100644 --- a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj +++ b/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj @@ -1,4 +1,4 @@ - + uap10.0 @@ -7,7 +7,5 @@ - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.v3.ncrunchproject b/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.v3.ncrunchproject deleted file mode 100644 index 319cd523..00000000 --- a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json new file mode 100644 index 00000000..19790e99 --- /dev/null +++ b/Rx.NET/Source/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "MSBuild.Sdk.Extras": "1.3.0" + } +} \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/Properties/AssemblyInfo.cs b/Rx.NET/Source/src/AssemblyInfo.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Properties/AssemblyInfo.cs rename to Rx.NET/Source/src/AssemblyInfo.cs diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj index 0b0d2b69..31f727cf 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.v3.ncrunchproject b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.v3.ncrunchproject deleted file mode 100644 index 0cef203a..00000000 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.v3.ncrunchproject +++ /dev/null @@ -1,9 +0,0 @@ - - - True - - CopyReferencedAssembliesToWorkspaceIsOn - - True - - \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/IScheduledItem.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IScheduledItem.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/IScheduledItem.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IScheduledItem.cs diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/IScheduler.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IScheduler.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/IScheduler.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IScheduler.cs diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/ISchedulerLongRunning.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/ISchedulerLongRunning.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/ISchedulerLongRunning.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/ISchedulerLongRunning.cs diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/ISchedulerPeriodic.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/ISchedulerPeriodic.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/ISchedulerPeriodic.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/ISchedulerPeriodic.cs diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/IStopwatch.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IStopwatch.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/IStopwatch.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IStopwatch.cs diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/IStopwatchProvider.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IStopwatchProvider.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Concurrency/IStopwatchProvider.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Concurrency/IStopwatchProvider.cs diff --git a/Rx.NET/Source/src/System.Reactive/Disposables/ICancelable.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Disposables/ICancelable.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Disposables/ICancelable.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Disposables/ICancelable.cs diff --git a/Rx.NET/Source/src/System.Reactive/IEventPattern.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/IEventPattern.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/IEventPattern.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/IEventPattern.cs diff --git a/Rx.NET/Source/src/System.Reactive/IEventPatternSource.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/IEventPatternSource.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/IEventPatternSource.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/IEventPatternSource.cs diff --git a/Rx.NET/Source/src/System.Reactive/IEventSource.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/IEventSource.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/IEventSource.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/IEventSource.cs diff --git a/Rx.NET/Source/src/System.Reactive/IObserver.Result.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/IObserver.Result.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/IObserver.Result.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/IObserver.Result.cs diff --git a/Rx.NET/Source/src/System.Reactive/Linq/IGroupedObservable.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IGroupedObservable.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Linq/IGroupedObservable.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IGroupedObservable.cs diff --git a/Rx.NET/Source/src/System.Reactive/Linq/IQbservable.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IQbservable.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Linq/IQbservable.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IQbservable.cs diff --git a/Rx.NET/Source/src/System.Reactive/Linq/IQbservableProvider.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IQbservableProvider.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Linq/IQbservableProvider.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Linq/IQbservableProvider.cs diff --git a/Rx.NET/Source/src/System.Reactive/Subjects/IConnectableObservable.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/IConnectableObservable.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Subjects/IConnectableObservable.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/IConnectableObservable.cs diff --git a/Rx.NET/Source/src/System.Reactive/Subjects/ISubject.Multi.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/ISubject.Multi.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Subjects/ISubject.Multi.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/ISubject.Multi.cs diff --git a/Rx.NET/Source/src/System.Reactive/Subjects/ISubject.cs b/Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/ISubject.cs similarity index 100% rename from Rx.NET/Source/src/System.Reactive/Subjects/ISubject.cs rename to Rx.NET/Source/src/System.Reactive.Interfaces/Subjects/ISubject.cs diff --git a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/Properties/AssemblyInfo.cs b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/Properties/AssemblyInfo.cs deleted file mode 100644 index a3b27112..00000000 --- a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; -using System.Security; - -[assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] -[assembly: AllowPartiallyTrustedCallers] \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj index a117f89b..ac194bff 100644 --- a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj +++ b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj @@ -5,8 +5,11 @@ false Rx;Reactive;Extensions;Observable;LINQ;Events Reactive Extensions (Rx) provides the aliases Map, FlatMap, and Filter - + + + + - + \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.v3.ncrunchproject b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.v3.ncrunchproject deleted file mode 100644 index b17645bc..00000000 --- a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.v3.ncrunchproject +++ /dev/null @@ -1,10 +0,0 @@ - - - True - - AllowPartiallyTrustedCallers - CopyReferencedAssembliesToWorkspaceIsOn - - True - - \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj index 50789d98..a1b94405 100644 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj +++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj @@ -1,4 +1,4 @@ - + netstandard2.0;netstandard1.3;net45;net46;uap10.0 false @@ -12,6 +12,8 @@ + + @@ -49,7 +51,6 @@ - @@ -58,17 +59,7 @@ - - - - - - - - - + - - \ No newline at end of file diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.v3.ncrunchproject b/Rx.NET/Source/src/System.Reactive/System.Reactive.v3.ncrunchproject deleted file mode 100644 index 7be91562..00000000 --- a/Rx.NET/Source/src/System.Reactive/System.Reactive.v3.ncrunchproject +++ /dev/null @@ -1,8 +0,0 @@ - - - - AllowPartiallyTrustedCallers - - True - - \ No newline at end of file diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj index 9d9e9c35..d51127e2 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj @@ -90,9 +90,9 @@ true - - - + + + @@ -397,6 +397,9 @@ {01706a0f-8a63-4fd6-af45-0bc0bed3c0d9} System.Reactive + + Microsoft.Reactive.Interfaces + {73078FB5-6038-4674-B4C4-32FD81B88055} Microsoft.Reactive.Testing diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.v3.ncrunchproject b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.v3.ncrunchproject deleted file mode 100644 index 319cd523..00000000 --- a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj index 7bb330e8..68e2a3d2 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj @@ -2,7 +2,6 @@ net46;netcoreapp1.1;netcoreapp2.0 $(NoWarn);CS0618 - 2.0.0 @@ -16,10 +15,10 @@ - - - - + + + + diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.v3.ncrunchproject b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.v3.ncrunchproject deleted file mode 100644 index 68b3d2b2..00000000 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.v3.ncrunchproject +++ /dev/null @@ -1,17 +0,0 @@ - - - - True - - CopyReferencedAssembliesToWorkspaceIsOn - - - - ReactiveTests.Tests.VirtualSchedulerTest.Virtual_ThreadSafety - - - - False - True - - \ No newline at end of file diff --git a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj b/Rx.Net/Source/src/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj similarity index 63% rename from Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj rename to Rx.Net/Source/src/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj index 685c4e39..fdc7565c 100644 --- a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj +++ b/Rx.Net/Source/src/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj @@ -5,7 +5,7 @@ - + - + \ No newline at end of file