Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix format #1529

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Fix format #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfdd8f5
fix formatting ("dotnet-format --fix-whitespace")
Bertk Oct 11, 2023
fa12401
apply format after merge
Bertk Oct 20, 2023
6e196a4
remove comments
Bertk Oct 20, 2023
701015f
rebase and apply formatting ("dotnet-format --fix-whitespace")
Bertk Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true

file_header_template = Copyright (c) Toni Solarin-Sodara\nLicensed under the MIT license. See LICENSE file in the project root for full license information.

# XML project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2
Expand Down
8 changes: 8 additions & 0 deletions Documentation/Examples/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# top-most EditorConfig file
# We don't want to import other EditorConfig files and we want
# to ensure no rules are enabled for these asset source files.
root = true

[*.cs]
# Default severity for all analyzer diagnostics
dotnet_analyzer_diagnostic.severity = none
6 changes: 2 additions & 4 deletions Documentation/Examples/MSBuild/DeterministicBuild/ClassLibrary1/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;

namespace ClassLibrary1
namespace ClassLibrary1
{
public class Class1
public class Class1
{
public int Method()
{
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/MSBuild/DeterministicBuild/ClassLibrary1/ClassLibrary1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

</Project>
5 changes: 4 additions & 1 deletion Documentation/Examples/MSBuild/DeterministicBuild/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions Documentation/Examples/MSBuild/DeterministicBuild/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<Project>
<!-- Deterministic build workaround -->
<Import Project="$(MSBuildThisFileDirectory)DeterministicBuild.targets" />

</Project>
1 change: 1 addition & 0 deletions Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions Documentation/Examples/MSBuild/MergeWith/ClassLibrary1/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;

namespace ClassLibrary1
namespace ClassLibrary1
{
public class Class1
public class Class1
{
public int Method()
{
Expand Down
6 changes: 2 additions & 4 deletions Documentation/Examples/MSBuild/MergeWith/ClassLibrary2/Class2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;

namespace ClassLibrary2
namespace ClassLibrary2
{
public class Class2
public class Class2
{
public int Method()
{
Expand Down
6 changes: 2 additions & 4 deletions Documentation/Examples/MSBuild/MergeWith/ClassLibrary3/Class3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;

namespace ClassLibrary3
namespace ClassLibrary3
{
public class Class3
public class Class3
{
public int Method()
{
Expand Down
5 changes: 2 additions & 3 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Xunit;
using Xunit;

namespace XUnitTestProject1
{
public class UnitTest1
public class UnitTest1
{
[Fact]
public void Test1()
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/UnitTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Xunit;
using Xunit;

namespace XUnitTestProject2
{
public class UnitTest2
public class UnitTest2
{
[Fact]
public void Test2()
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/UnitTest3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Xunit;
using Xunit;

namespace XUnitTestProject3
{
public class UnitTest3
public class UnitTest3
{
[Fact]
public void Test3()
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/XUnitTestProject3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/VSTest/DeterministicBuild/ClassLibrary1/ClassLibrary1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion Documentation/Examples/VSTest/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand Down
6 changes: 2 additions & 4 deletions Documentation/Examples/VSTest/HelloWorld/ClassLibrary1/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;

namespace ClassLibrary1
namespace ClassLibrary1
{
public class Class1
public class Class1
{
public int Method()
{
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/VSTest/HelloWorld/ClassLibrary1/ClassLibrary1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

</Project>
0 ...loWorld/XUnitTestProject1/runsettings.xml → ...HelloWorld/XUnitTestProject1/.runsettings
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using Xunit;
using Xunit;

namespace XUnitTestProject1
{
public class UnitTest1
public class UnitTest1
{
[Fact]
public void Test1()
Expand Down
1 change: 1 addition & 0 deletions Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/XUnitTestProject1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<RunSettingsFilePath>$(MSBuildThisFileDirectory).runsettings</RunSettingsFilePath>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading