Merge pull request #826 from dotnet/ixcleanup

Ix updates

.editorconfig

@@ -7,6 +7,7 @@ root = true
 # Don't use tabs for indentation.
 [*]
 indent_style = space
+trim_trailing_whitespace = true
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
@@ -27,6 +28,10 @@ indent_size = 2
 [*.{yaml,yml}]
 indent_size = 2
 
+# Powershell files
+[*.ps1]
+indent_size = 2
+
 # JSON files
 [*.json]
 indent_size = 2
@@ -69,7 +74,13 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
 dotnet_style_prefer_conditional_expression_over_return = false
 dotnet_style_prefer_conditional_expression_over_assignment = false
-dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_auto_properties = true:suggestion
+
+# Parentheses
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 # Accessibility modifiers
 dotnet_style_require_accessibility_modifiers = always:suggestion
@@ -163,6 +174,12 @@ dotnet_naming_style.pascal_case_and_prefix_with_I_style.capitalization
 
 # CSharp code style settings:
 [*.cs]
+# Modifier order
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# Code block
+csharp_prefer_braces = false:none
+
 # Indentation preferences
 csharp_indent_block_contents = true
 csharp_indent_braces = false
@@ -234,4 +251,12 @@ csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
+csharp_space_between_square_brackets = false
+
+
+
+
+
+
+
+

Ix.NET/Source/CodeCoverage.runsettings

@@ -21,7 +21,7 @@ Included items must then not match any entries in the exclude list to remain inc
                 <ModulePath>.*Interactive.*</ModulePath>
               </Include>
               <Exclude>
-                <ModulePath>.*Tests.*</ModulePath>
+                <ModulePath>.*Tests.dll$</ModulePath>
               </Exclude>
             </ModulePaths>
 

Ix.NET/Source/Directory.build.props

@@ -21,8 +21,8 @@
   </PropertyGroup>
     
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
   </ItemGroup>
   
   <Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">

Ix.NET/Source/Ix.NET.sln

@@ -7,12 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{87534290
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B733D97A-F1ED-4FC3-BF8E-9AC47A89DE96}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\.vsts.ix-ci.yml = ..\..\.vsts.ix-ci.yml
-		..\..\.vsts.ix-pr.yml = ..\..\.vsts.ix-pr.yml
-		..\..\.vsts.ix-shared.yml = ..\..\.vsts.ix-shared.yml
+		..\..\.editorconfig = ..\..\.editorconfig
+		..\..\azure-pipelines.ix.yml = ..\..\azure-pipelines.ix.yml
 		CodeCoverage.runsettings = CodeCoverage.runsettings
 		Directory.build.props = Directory.build.props
 		Directory.build.targets = Directory.build.targets
+		global.json = global.json
 		NuGet.Config = NuGet.Config
 	EndProjectSection
 EndProject

Ix.NET/Source/global.json

@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.6.30-preview"
+    "MSBuild.Sdk.Extras": "1.6.55"
   }
 }

Ix.NET/Source/refs/Directory.build.props

@@ -5,6 +5,8 @@
   <PropertyGroup>
     <!-- This is here so we can create a fake .NET Standard 2.1 facade -->
     <NETStandardMaximumVersion>2.1</NETStandardMaximumVersion>
+
+    <DefineConstants>$(DefineConstants);REFERENCE_ASSEMBLY</DefineConstants>
   </PropertyGroup>
 
 </Project>