Skip to content

Commit

Permalink
Fix some whitespace issues in various files. (#12399)
Browse files Browse the repository at this point in the history
* Remove BOM
* Add EOL at end of file.
  • Loading branch information
rolfbjarne authored Aug 11, 2021
1 parent 46afe81 commit 2972e1b
Show file tree
Hide file tree
Showing 1,700 changed files with 1,632 additions and 1,984 deletions.
1 change: 0 additions & 1 deletion builds/fix-maccatalyst-assembly/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ static int Fix (string input, string output)
}
}
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Xml.Linq;
using System.IO;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
<RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ public void DidEnterBackground (UIScene scene)
// to restore the scene back to its current state.
}
}

4 changes: 2 additions & 2 deletions dotnet/Templates/Microsoft.iOS.Templates/ios/iOSApp1.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
</Project>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion msbuild/Messaging/Xamarin.Messaging.Build/BuildEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ public object UnregisterTaskObject (object key, RegisteredTaskObjectLifetime lif
throw new NotImplementedException ();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ protected override async Task<CompareItemsResult> ExecuteAsync (CompareItemsMess
}).ConfigureAwait (continueOnCapturedContext: false);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ await Task.Run (async () => {
});
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ protected override async Task<GetItemResult> ExecuteAsync (GetItemMessage messag
}).ConfigureAwait (continueOnCapturedContext: false);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -59,4 +59,4 @@ string GetUniversalTypeIdentifier (string filePath)
return string.Empty;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using Xamarin.Messaging.Client;
using System.Threading.Tasks;
using Xamarin.MacDev;
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Messaging/Xamarin.Messaging.Build/ITaskRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ namespace Xamarin.Messaging.Build {
public interface ITaskRunner {
ExecuteTaskResult Execute (string taskName, string inputs);
}
}
}
2 changes: 1 addition & 1 deletion msbuild/Messaging/Xamarin.Messaging.Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ static async Task Main (string [] args)
await runner.RunAsync ().ConfigureAwait (continueOnCapturedContext: false);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo ("Xamarin.Messaging.UnitTests")]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
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>net472</TargetFramework>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -61,4 +61,4 @@
<HintPath>..\..\Xamarin.iOS.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.iOS.Tasks.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
</Project>
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-ios</TargetFramework>
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
Expand Down Expand Up @@ -29,4 +29,4 @@
<Target Name="CopyAdditionalReferences" DependsOnTargets="ResolveAdditionalReferences" AfterTargets="_CalculateCodesignAppBundleInputs" Inputs="@(AdditionalFiles)" Outputs="@(AdditionalFiles -> '$(_AppBundlePath)$(_AppBundleName).content\%(RecursiveDir)%(Filename)%(Extension)')">
<Copy SourceFiles="@(AdditionalFiles)" DestinationFiles="@(AdditionalFiles -> '$(_AppBundlePath)$(_AppBundleName).content\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target> -->
</Project>
</Project>
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks.Core/Tasks/MmpTaskBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// MmpTask.cs
//
// Author:
Expand Down
4 changes: 2 additions & 2 deletions msbuild/Xamarin.Mac.Tasks.Core/Tasks/XamMacArch.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// XamMacArch.cs
//
// Author:
Expand All @@ -18,4 +18,4 @@ public enum XamMacArch
x86_64 = 2,
ARM64 = 4,
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/ACTool.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev;
using Xamarin.MacDev;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks {
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/CodesignVerify.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev;
using Xamarin.MacDev;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/CompileAppManifest.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// CompileAppManifestTask.cs
//
// Author:
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/CompileSceneKitAssets.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev.Tasks;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks
{
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/CreateEmbeddedResources.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev.Tasks;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks
{
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/DetectSigningIdentity.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// DetectSigningIdentityTask.cs
//
// Author:
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/IBTool.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev;
using Xamarin.MacDev;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks {
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/MetalLib.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.IO;
using System.IO;
using Xamarin.MacDev;
using Xamarin.MacDev.Tasks;

Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Mac.Tasks/Tasks/ScnTool.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xamarin.MacDev.Tasks;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks
{
Expand Down
3 changes: 1 addition & 2 deletions msbuild/Xamarin.Mac.Tasks/Tasks/TextureAtlas.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Xamarin.MacDev.Tasks;
using Xamarin.MacDev.Tasks;

namespace Xamarin.Mac.Tasks
{
public class TextureAtlas : TextureAtlasTaskBase
{
}
}

2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/AssetPackUtils.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/BundleResource.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Text;
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Build.Utilities;

namespace Microsoft.Build.Tasks
Expand All @@ -8,4 +8,4 @@ public static class TaskExtensions
public static bool ShouldExecuteRemotely (this Task task, string sessionId)
=> Environment.OSVersion.Platform == PlatformID.Win32NT && !string.IsNullOrEmpty (sessionId);
}
}
}
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/LinkTarget.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;

namespace Xamarin.MacDev.Tasks
{
Expand Down
1 change: 0 additions & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/LinkerOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,3 @@ public void BuildNativeReferenceFlags (TaskLoggingHelper Log, ITaskItem[] Native
}
}
}

2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/LoggingExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

namespace Xamarin.MacDev.Tasks
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/CopyBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class CopyBase : Copy
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ public abstract class DeleteBase : Delete
public string SessionId { get; set; }
}
}

2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/ExecBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class ExecBase : Exec
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class MakeDirBase : MakeDir
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class MoveTaskBase : Move
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class TouchBase : Touch
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.Build.Tasks
namespace Microsoft.Build.Tasks
{
public abstract class WriteLinesToFileBase : WriteLinesToFile
{
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/NativeReferenceKind.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Xamarin.MacDev.Tasks
namespace Xamarin.MacDev.Tasks
{
public enum NativeReferenceKind {
Static,
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/PlatformFramework.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// PlatformFramework.cs
//
// Author: Jeffrey Stedfast <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/PlatformUtils.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Xamarin.MacDev.Tasks
namespace Xamarin.MacDev.Tasks
{
public static class PlatformUtils
{
Expand Down
3 changes: 1 addition & 2 deletions msbuild/Xamarin.MacDev.Tasks.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// AssemblyInfo.cs
//
// Author: Jeffrey Stedfast <[email protected]>
Expand Down Expand Up @@ -51,4 +51,3 @@
//[assembly: AssemblyKeyFile("")]

[assembly: InternalsVisibleTo ("Xamarin.MacDev.Tasks.Tests")]

1 change: 0 additions & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/Sdks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,3 @@ public static IAppleSdk GetAppleSdk (string targetFrameworkMoniker)

}
}

2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks.Core/StringParserService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Text;
using System.Collections.Generic;

Expand Down
Loading

4 comments on commit 2972e1b

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

API Diff (from PR only) (no change)
Generator Diff (only version changes)

Packages generated

View packages

Test results

1 tests failed, 232 tests passed.

Failed tests

  • Documentation/All: Failed

Pipeline on Agent XAMBOT-1028.BigSur'
Fix some whitespace issues in various files. (#12399)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
Fix some whitespace issues in various files. (#12399)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
Fix some whitespace issues in various files. (#12399)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS M1 - Mac Big Sur (11.5) ❌

Tests failed on M1 - Mac Big Sur (11.5).

Failed tests are:

  • xammac_tests

Pipeline on Agent
Fix some whitespace issues in various files. (#12399)

Please sign in to comment.