Skip to content

Commit 7e410cc

Browse files
Revert "Merge branch 'upstream/master' into 1484_ExcludeFromCoverageSynthesizedNames"
This reverts commit 1b4fa5c, reversing changes made to 2c3e0ad.
1 parent 1b4fa5c commit 7e410cc

File tree

145 files changed

+11467
-12368
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

+11467
-12368
lines changed

.editorconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ 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-
1816
# XML project files
1917
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
2018
indent_size = 2

Documentation/Examples/.editorconfig

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

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

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

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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
65
</PropertyGroup>
76

87
</Project>

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

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
6-
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
76
</PropertyGroup>
87

98
<ItemGroup>

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

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

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

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

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

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

0 commit comments

Comments
 (0)