bring back standalone System.Reactive.Interfaces package (#418)
* ignore some noise * move interfaces out to System.Reactive.Interfaces * remove typeforwarders * invert the project references * add assembly info * unify AssemblyInfo files * re-add properties linking to new source * update xunit to stable version * pack the package * update packages * use stable dotcover * remove files * use dotnet test * just test * split restore * restore * add binlog * Add interfaces to uwp test project * Update package versions * workaround * test * add vsts yml * update xunit * latest extras * no restore * build * build script * fix merge issue
This commit is contained in:
Brendan Forster
Oren Novotny
Родитель
9af0f365c7
Коммит
8edb4bef54
|
|
@ -117,7 +117,7 @@ Generated_Code #added for RIA/Silverlight projects
|
|||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
|
||||
UpgradeLog*.htm
|
||||
|
||||
|
||||
############
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
@ -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
|
||||
|
|
@ -19,30 +19,12 @@
|
|||
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Rx.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
|
||||
<!-- Disabled until https://github.com/ctaggart/SourceLink/issues/230 is fixed -->
|
||||
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.6.0" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<NerdbankGitVersioningVersion>2.0.41</NerdbankGitVersioningVersion>
|
||||
</PropertyGroup>
|
||||
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- https://github.com/NuGet/Home/issues/4337 -->
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
|
||||
<Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
|
||||
Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="FixUpVersion"
|
||||
BeforeTargets="_GenerateRestoreProjectSpec"
|
||||
DependsOnTargets="GetBuildVersion"
|
||||
Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,4 @@
|
|||
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<DefineConstants>$(DefineConstants);HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- UWP -->
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.2.3" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -1,216 +0,0 @@
|
|||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:Boolean x:Key="/Default/CodeEditing/GenerateMemberBody/CopyXmlDocumentation/@EntryValue">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">SUGGESTION</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FElsewhere/@EntryIndexedValue">SUGGESTION</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">SUGGESTION</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=NoReordering/@EntryIndexedValue"><?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></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Normal/@EntryIndexedValue"><?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></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Default: Full Cleanup</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">NoReordering</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/APPLY_ON_COMPLETION/@EntryValue">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Explicit</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXPRESSION/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_ANONYMOUS_METHOD_BLOCK/@EntryValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_LINQ_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_ALWAYS</s:String>
|
||||
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">160</s:Int64>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue"><?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></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System/@EntryIndexedValue">System</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002ECollections_002EGeneric/@EntryIndexedValue">System.Collections.Generic</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002ELinq/@EntryIndexedValue">System.Linq</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002EText/@EntryIndexedValue">System.Text</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002EThreading_002ETasks/@EntryIndexedValue">System.Threading.Tasks</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System/@EntryIndexedValue">System</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System_002ECollections_002EGeneric/@EntryIndexedValue">System.Collections.Generic</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System_002ELinq/@EntryIndexedValue">System.Linq</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System_002EThreading_002ETasks/@EntryIndexedValue">System.Threading.Tasks</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">// 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. </s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/Generate/=Constructor/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=Constructor/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/Generate/=EqualityMembers/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=EqualityMembers/Options/=EqualityOperators/@EntryIndexedValue">True</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=EqualityMembers/Options/=ImplementIEquatable/@EntryIndexedValue">True</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=EqualityMembers/Options/=XmlDocumentation/@EntryIndexedValue">True</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/Generate/=Global/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=Global/Options/=PropertyBody/@EntryIndexedValue">Automatic property</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=Global/Options/=WrapInRegion/@EntryIndexedValue">False</s:String>
|
||||
<s:Boolean x:Key="/Default/CodeStyle/Generate/=Implementations/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=WrapInRegion/@EntryIndexedValue">False</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FAKEPROPERTY/@EntryIndexedValue">FAKEPROPERTY</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RT/@EntryIndexedValue">RT</s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /></s:String>
|
||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="Contract" Style="AaBb" /></Policy></s:String>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<SolutionConfiguration>
|
||||
<Settings>
|
||||
<AllowParallelTestExecution>True</AllowParallelTestExecution>
|
||||
<SolutionConfigured>True</SolutionConfigured>
|
||||
</Settings>
|
||||
</SolutionConfiguration>
|
||||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<dependencies>
|
||||
<group targetFramework="netstandard1.3">
|
||||
<dependency id="System.Reactive.Core" version="$version$" />
|
||||
<dependency id="System.Reactive.Interfaces" version="$version$" />
|
||||
<dependency id="System.Reactive.Linq" version="$version$" />
|
||||
<dependency id="System.Reactive.PlatformServices" version="$version$" />
|
||||
<dependency id="System.Reactive.Providers" version="$version$" />
|
||||
|
|
@ -25,7 +24,6 @@
|
|||
<group targetFramework="net45">
|
||||
<dependency id="System.Reactive.Core" version="$version$" />
|
||||
<dependency id="System.Reactive.Experimental" version="$version$" />
|
||||
<dependency id="System.Reactive.Interfaces" version="$version$" />
|
||||
<dependency id="System.Reactive.Linq" version="$version$" />
|
||||
<dependency id="System.Reactive.PlatformServices" version="$version$" />
|
||||
<dependency id="System.Reactive.Providers" version="$version$" />
|
||||
|
|
@ -35,7 +33,6 @@
|
|||
</group>
|
||||
<group targetFramework="uap10.0">
|
||||
<dependency id="System.Reactive.Core" version="$version$" />
|
||||
<dependency id="System.Reactive.Interfaces" version="$version$" />
|
||||
<dependency id="System.Reactive.Linq" version="$version$" />
|
||||
<dependency id="System.Reactive.PlatformServices" version="$version$" />
|
||||
<dependency id="System.Reactive.Providers" version="$version$" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net45;net46;netstandard1.3;uap10.0;netcoreapp1.0</TargetFrameworks>
|
||||
|
|
@ -8,6 +8,4 @@
|
|||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -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<,>))]
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net45;net46;netstandard1.3;netcoreapp1.0;uap10.0</TargetFrameworks>
|
||||
|
|
@ -8,6 +8,4 @@
|
|||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net45;uap10.0</TargetFrameworks>
|
||||
|
|
@ -7,7 +7,5 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>uap10.0</TargetFramework>
|
||||
|
|
@ -7,7 +7,5 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"msbuild-sdks": {
|
||||
"MSBuild.Sdk.Extras": "1.3.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Properties\*.xml" />
|
||||
<PackageReference Include="xunit.assert.source" Version="2.2.0" PrivateAssets="All" />
|
||||
<PackageReference Include="xunit.assert.source" Version="2.3.1" PrivateAssets="All" />
|
||||
<ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
|
||||
<HiddenComponentWarnings>
|
||||
<Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
|
||||
</HiddenComponentWarnings>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -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]
|
||||
|
|
@ -5,8 +5,11 @@
|
|||
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
|
||||
<PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
|
||||
<Description>Reactive Extensions (Rx) provides the aliases Map, FlatMap, and Filter</Description>
|
||||
</PropertyGroup>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
|
||||
</ItemGroup>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
|
||||
<HiddenComponentWarnings>
|
||||
<Value>AllowPartiallyTrustedCallers</Value>
|
||||
<Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
|
||||
</HiddenComponentWarnings>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;netstandard1.3;net45;net46;uap10.0</TargetFrameworks>
|
||||
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
|
||||
|
|
@ -12,6 +12,8 @@
|
|||
<EmbeddedResource Remove="Platforms\**\*.*" />
|
||||
<!-- Workaround so the files appear in VS -->
|
||||
<None Include="Platforms\**\*.*" />
|
||||
<Compile Include="..\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
|
||||
<ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj" />
|
||||
<None Update="Platforms\Windows\Strings_WindowsThreading.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Strings_WindowsThreading.resx" />
|
||||
<None Update="Platforms\Windows\Strings_WindowsThreading.resx" CustomToolNamespace="System.Reactive" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_WindowsThreading.Designer.cs" />
|
||||
</ItemGroup>
|
||||
|
|
@ -49,7 +51,6 @@
|
|||
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46'">
|
||||
<Reference Include="System.Windows" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Compile Include="Platforms\Desktop\**\*.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
@ -58,17 +59,7 @@
|
|||
<None Update="Linq\Observable\CombineLatest.Generated.tt" Generator="TextTemplatingFileGenerator" LastGenOutput="CombineLatest.Generated.cs" />
|
||||
<Compile Update="Linq\Observable\CombineLatest.Generated.cs" DesignTime="True" AutoGen="True" DependentUpon="CombineLatest.Generated.tt" />
|
||||
<None Update="Linq\Observable\Zip.Generated.tt" Generator="TextTemplatingFileGenerator" LastGenOutput="Zip.Generated.cs" />
|
||||
<Compile Update="Linq\Observable\Zip.Generated.cs" DesignTime="True" AutoGen="True" DependentUpon="Zip.Generated.tt" />
|
||||
<Compile Update="Strings_Core.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_Core.resx" />
|
||||
<Compile Update="Strings_Linq.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_Linq.resx" />
|
||||
<Compile Update="Strings_PlatformServices.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_PlatformServices.resx" />
|
||||
<Compile Update="Strings_Providers.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_Providers.resx" />
|
||||
<EmbeddedResource Update="Strings_Core.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_Core.Designer.cs" />
|
||||
<EmbeddedResource Update="Strings_Linq.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_Linq.Designer.cs" />
|
||||
<EmbeddedResource Update="Strings_PlatformServices.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_PlatformServices.Designer.cs" />
|
||||
<EmbeddedResource Update="Strings_Providers.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_Providers.Designer.cs" />
|
||||
<Compile Update="Linq\Observable\Zip.Generated.cs" DesignTime="True" AutoGen="True" DependentUpon="Zip.Generated.tt" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<HiddenComponentWarnings>
|
||||
<Value>AllowPartiallyTrustedCallers</Value>
|
||||
</HiddenComponentWarnings>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -90,9 +90,9 @@
|
|||
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.3.0" />
|
||||
<PackageReference Include="xunit" Version="2.2.0" />
|
||||
<PackageReference Include="xunit.runner.devices" Version="2.2.0-rc1" />
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
|
||||
<PackageReference Include="xunit" Version="2.3.1" />
|
||||
<PackageReference Include="xunit.runner.devices" Version="2.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
|
||||
|
|
@ -397,6 +397,9 @@
|
|||
<Project>{01706a0f-8a63-4fd6-af45-0bc0bed3c0d9}</Project>
|
||||
<Name>System.Reactive</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj">
|
||||
<Name>Microsoft.Reactive.Interfaces</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj">
|
||||
<Project>{73078FB5-6038-4674-B4C4-32FD81B88055}</Project>
|
||||
<Name>Microsoft.Reactive.Testing</Name>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
<PropertyGroup>
|
||||
<TargetFrameworks>net46;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);CS0618</NoWarn>
|
||||
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -16,10 +15,10 @@
|
|||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
|
||||
<PackageReference Include="xunit" Version="2.3.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
|
||||
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
|
||||
<PackageReference Include="xunit" Version="2.4.0-beta.2.build3981" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.2.build3981" />
|
||||
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.2.build3981" />
|
||||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
<ProjectReference Include="..\..\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" />
|
||||
<ProjectReference Include="..\..\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" />
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<AdditionalFilesToIncludeForProject />
|
||||
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
|
||||
<HiddenComponentWarnings>
|
||||
<Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
|
||||
</HiddenComponentWarnings>
|
||||
<IgnoredTests>
|
||||
<NamedTestSelector>
|
||||
<TestName>ReactiveTests.Tests.VirtualSchedulerTest.Virtual_ThreadSafety</TestName>
|
||||
</NamedTestSelector>
|
||||
</IgnoredTests>
|
||||
<ImplicitProjectDependencyPathsRelativeToSolutionDirectory />
|
||||
<PreloadReferencedAssemblies>False</PreloadReferencedAssemblies>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
|
||||
<Compile Include="..\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче