Skip to content

Commit 91acb45

Browse files
authored
Fix format (#1529)
* fix formatting ("dotnet-format --fix-whitespace") * apply format after merge * remove comments * rebase and apply formatting ("dotnet-format --fix-whitespace")
1 parent 3ec85e7 commit 91acb45

File tree

145 files changed

+11496
-11490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+11496
-11490
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ indent_style = space
1313
indent_size = 4
1414
trim_trailing_whitespace = true
1515

16+
file_header_template = Copyright (c) Toni Solarin-Sodara\nLicensed under the MIT license. See LICENSE file in the project root for full license information.
17+
1618
# XML project files
1719
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
1820
indent_size = 2

Documentation/Examples/.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# top-most EditorConfig file
2+
# We don't want to import other EditorConfig files and we want
3+
# to ensure no rules are enabled for these asset source files.
4+
root = true
5+
6+
[*.cs]
7+
# Default severity for all analyzer diagnostics
8+
dotnet_analyzer_diagnostic.severity = none

Documentation/Examples/MSBuild/DeterministicBuild/ClassLibrary1/Class1.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
2-
3-
namespace ClassLibrary1
1+
namespace ClassLibrary1
42
{
5-
public class Class1
3+
public class Class1
64
{
75
public int Method()
86
{

Documentation/Examples/MSBuild/DeterministicBuild/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
56
</PropertyGroup>
67

78
</Project>

Documentation/Examples/MSBuild/DeterministicBuild/Directory.Build.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14+
</PackageReference>
1215
</ItemGroup>
1316
</Project>
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<Project>
2-
<!-- Deterministic build workaround -->
3-
<Import Project="$(MSBuildThisFileDirectory)DeterministicBuild.targets" />
2+
43
</Project>

Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
67
</PropertyGroup>
78

89
<ItemGroup>

Documentation/Examples/MSBuild/MergeWith/ClassLibrary1/Class1.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
2-
3-
namespace ClassLibrary1
1+
namespace ClassLibrary1
42
{
5-
public class Class1
3+
public class Class1
64
{
75
public int Method()
86
{

Documentation/Examples/MSBuild/MergeWith/ClassLibrary2/Class2.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
2-
3-
namespace ClassLibrary2
1+
namespace ClassLibrary2
42
{
5-
public class Class2
3+
public class Class2
64
{
75
public int Method()
86
{

Documentation/Examples/MSBuild/MergeWith/ClassLibrary3/Class3.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
2-
3-
namespace ClassLibrary3
1+
namespace ClassLibrary3
42
{
5-
public class Class3
3+
public class Class3
64
{
75
public int Method()
86
{

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/UnitTest1.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
2-
using Xunit;
1+
using Xunit;
32

43
namespace XUnitTestProject1
54
{
6-
public class UnitTest1
5+
public class UnitTest1
76
{
87
[Fact]
98
public void Test1()

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
67
</PropertyGroup>
78

89
<ItemGroup>

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/UnitTest2.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
2-
using Xunit;
1+
using Xunit;
32

43
namespace XUnitTestProject2
54
{
6-
public class UnitTest2
5+
public class UnitTest2
76
{
87
[Fact]
98
public void Test2()

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
67
</PropertyGroup>
78

89
<ItemGroup>

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/UnitTest3.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
2-
using Xunit;
1+
using Xunit;
32

43
namespace XUnitTestProject3
54
{
6-
public class UnitTest3
5+
public class UnitTest3
76
{
87
[Fact]
98
public void Test3()

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/XUnitTestProject3.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
67
</PropertyGroup>
78

89
<ItemGroup>

Documentation/Examples/VSTest/DeterministicBuild/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
56
</PropertyGroup>
67

78
</Project>

Documentation/Examples/VSTest/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>

Documentation/Examples/VSTest/HelloWorld/ClassLibrary1/Class1.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System;
2-
3-
namespace ClassLibrary1
1+
namespace ClassLibrary1
42
{
5-
public class Class1
3+
public class Class1
64
{
75
public int Method()
86
{

Documentation/Examples/VSTest/HelloWorld/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
56
</PropertyGroup>
67

78
</Project>

Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/UnitTest1.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
2-
using Xunit;
1+
using Xunit;
32

43
namespace XUnitTestProject1
54
{
6-
public class UnitTest1
5+
public class UnitTest1
76
{
87
[Fact]
98
public void Test1()

Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
7+
<RunSettingsFilePath>$(MSBuildThisFileDirectory).runsettings</RunSettingsFilePath>
78
</PropertyGroup>
89

910
<ItemGroup>

0 commit comments

Comments
 (0)