Skip to content

Commit

Permalink
Merge 67939e8 into dda12ff
Browse files Browse the repository at this point in the history
  • Loading branch information
shiftkey committed Apr 11, 2018
2 parents dda12ff + 67939e8 commit 7bcbf50
Show file tree
Hide file tree
Showing 56 changed files with 173 additions and 461 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Generated_Code #added for RIA/Silverlight projects
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

UpgradeLog*.htm


############
Expand Down
27 changes: 27 additions & 0 deletions .vsts.rx.yml
Original file line number Diff line number Diff line change
@@ -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()
83 changes: 83 additions & 0 deletions Rx.NET/Source/.editorconfig
Original file line number Diff line number Diff line change
@@ -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
24 changes: 3 additions & 21 deletions Rx.NET/Source/Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 0 additions & 5 deletions Rx.NET/Source/Directory.build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
37 changes: 18 additions & 19 deletions Rx.NET/Source/System.Reactive.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -308,14 +292,29 @@ 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
EndGlobalSection
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}
Expand Down

0 comments on commit 7bcbf50

Please sign in to comment.