Skip to content

Commit

Permalink
Merge pull request #754 from aolszowka/Issue-753-EditorConfig
Browse files Browse the repository at this point in the history
Update .editorconfig to support *.csproj
  • Loading branch information
OsirisTerje authored Jun 7, 2020
2 parents 25ae912 + 2058037 commit f3d9f51
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ root = true
indent_style = space
indent_size = 4

[*.csproj]
indent_style = space
indent_size = 2

[*.props]
indent_style = space
indent_size = 2
3 changes: 2 additions & 1 deletion src/NUnitTestAdapter/NUnit.TestAdapter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<AssemblyName>NUnit3.TestAdapter</AssemblyName>
<!--<AssemblyName>NUnit3.TestAdapterDebug</AssemblyName>-->
<RootNamespace>NUnit.VisualStudio.TestAdapter</RootNamespace>
<!--<TargetFramework>netcoreapp2.1</TargetFramework>--><!-- For testing and debugging-->
<!--<TargetFramework>netcoreapp2.1</TargetFramework>-->
<!-- For testing and debugging-->
<TargetFrameworks>net35;netcoreapp2.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SourceLinkOriginUrl>https://github.com/nunit/nunit3-vs-adapter</SourceLinkOriginUrl>
Expand Down
3 changes: 2 additions & 1 deletion src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<RootNamespace>NUnit.VisualStudio.TestAdapter.Tests</RootNamespace>
<AssemblyName>NUnit.VisualStudio.TestAdapter.Tests</AssemblyName>
<TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
<!--<TargetFrameworks>netcoreapp2.1</TargetFrameworks>--> <!-- For testing and debugging-->
<!--<TargetFrameworks>netcoreapp2.1</TargetFrameworks>-->
<!-- For testing and debugging-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
Expand Down

0 comments on commit f3d9f51

Please sign in to comment.