Merge branch 'dotnetformat' into 'main'

ran dotnet format See merge request Sharpmake/sharpmake!430
ubisoft · Aug 2, 2023 · 647a346 · 647a346
2 parents c9c23c7 + e67ba05
commit 647a346
Show file tree

Hide file tree

Showing 122 changed files with 278 additions and 1,464 deletions.
diff --git a/Sharpmake.Generators/Apple/XCodeProj.cs b/Sharpmake.Generators/Apple/XCodeProj.cs
@@ -653,7 +653,7 @@ private void RegisterScriptBuildPhase(string xCodeTargetName, Dictionary<string,
 
         private void RegisterHeadersBuildPhase(string xCodeTargetName, Dictionary<string, UniqueList<ProjectHeadersBuildPhase>> headersBuildPhases)
         {
-            var headerFiles =  _projectItems
+            var headerFiles = _projectItems
                     .Where(p => p is ProjectBuildFile)
                     .Select(p => p as ProjectBuildFile)
                     .Where(p => p.File.IsHeader)
@@ -695,7 +695,7 @@ private void RegisterCopyFilesBuildPhases(string xCodeTargetName, Dictionary<str
 
         private void RegisterCopyFilesBuildPhases(string xCodeTargetName, Dictionary<string, UniqueList<ProjectCopyFilesBuildPhase>> copyFilesPhases, IEnumerator<KeyValuePair<string, string>> filesAndTargets)
         {
-            while(filesAndTargets.MoveNext())
+            while (filesAndTargets.MoveNext())
             {
                 var fileAndTarget = filesAndTargets.Current;
                 RegisterCopyFilesBuildPhases(xCodeTargetName, copyFilesPhases, fileAndTarget.Key, fileAndTarget.Value);
@@ -1227,8 +1227,8 @@ private Options.ExplicitOptions GenerateOptions(XCodeGenerationContext context)
                 }
 
                 if (Path.HasExtension(library) &&
-                    ((Path.GetExtension(library).EndsWith(".a", StringComparison.OrdinalIgnoreCase ) ||
-                      Path.GetExtension(library).EndsWith(".dylib", StringComparison.OrdinalIgnoreCase )
+                    ((Path.GetExtension(library).EndsWith(".a", StringComparison.OrdinalIgnoreCase) ||
+                      Path.GetExtension(library).EndsWith(".dylib", StringComparison.OrdinalIgnoreCase)
                     )))
                 {
                     library = Path.GetFileNameWithoutExtension(library);
@@ -1718,7 +1718,7 @@ public ProjectSystemFrameworkFile(string frameworkFileName)
 
         private class ProjectDeveloperFrameworkFile : ProjectFrameworkFile
         {
-            private static readonly string s_frameworkPath = System.IO.Path.Combine("..",  "..", "Library", "Frameworks");
+            private static readonly string s_frameworkPath = System.IO.Path.Combine("..", "..", "Library", "Frameworks");
 
             public ProjectDeveloperFrameworkFile(string frameworkFileName)
                 : base(System.IO.Path.Combine(s_frameworkPath, frameworkFileName))

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs
@@ -981,7 +981,7 @@ public virtual void SelectCompilerOptions(IGenerationContext context)
                 Options.Option(Options.XCode.Compiler.MetalFastMath.Enable, () => options["MetalFastMath"] = "YES")
             );
 
-        #region infoplist keys
+            #region infoplist keys
             /// common keys
             options["CFBundleSpokenName"] = Options.StringOption.Get<Options.XCode.InfoPlist.CFBundleSpokenName>(conf);
             options["CFBundleDevelopmentRegion"] = Options.StringOption.Get<Options.XCode.InfoPlist.CFBundleDevelopmentRegion>(conf);
@@ -1039,7 +1039,7 @@ public virtual void SelectCompilerOptions(IGenerationContext context)
 
             /// - tvOS specific, set to proper value in override method
             options["UIAppSupportsHDR"] = FileGeneratorUtilities.RemoveLineTag;
-        #endregion // infoplist keys
+            #endregion // infoplist keys
         }
 
         public virtual void SelectPrecompiledHeaderOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs
@@ -79,16 +79,16 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     cmdLineOptions["IPhoneOSDeploymentTarget"] = FileGeneratorUtilities.RemoveLineTag;
                 }
 
-                 context.SelectOptionWithFallback(
-                    () => options["SupportsMaccatalyst"] = "YES",
-                    Options.Option(Options.XCode.Compiler.SupportsMaccatalyst.Disable, () => options["SupportsMaccatalyst"] = "NO")
-                );
+                context.SelectOptionWithFallback(
+                   () => options["SupportsMaccatalyst"] = "YES",
+                   Options.Option(Options.XCode.Compiler.SupportsMaccatalyst.Disable, () => options["SupportsMaccatalyst"] = "NO")
+               );
                 context.SelectOptionWithFallback(
                     () => options["SupportsMacDesignedForIphoneIpad"] = "YES",
                     Options.Option(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Disable, () => options["SupportsMacDesignedForIphoneIpad"] = "NO")
                 );
 
-            #region infoplist keys
+                #region infoplist keys
                 // MacOS specific flags
                 options["NSHumanReadableCopyright"] = Options.StringOption.Get<Options.XCode.InfoPlist.NSHumanReadableCopyright>(conf);
 
@@ -254,7 +254,7 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     Options.Option(Options.XCode.InfoPlist.UIRequiresPersistentWiFi.Disable, () => options["UIRequiresPersistentWiFi"] = "NO"),
                     Options.Option(Options.XCode.InfoPlist.UIRequiresPersistentWiFi.Enable, () => options["UIRequiresPersistentWiFi"] = "YES")
                 );
-            #endregion //infoplist keys
+                #endregion //infoplist keys
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacOsPlatform.cs
@@ -72,7 +72,7 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 options["SupportsMaccatalyst"] = FileGeneratorUtilities.RemoveLineTag;
                 options["SupportsMacDesignedForIphoneIpad"] = FileGeneratorUtilities.RemoveLineTag;
 
-            #region infoplist keys
+                #region infoplist keys
                 // MacOS specific flags
                 options["NSHumanReadableCopyright"] = Options.StringOption.Get<Options.XCode.InfoPlist.NSHumanReadableCopyright>(conf);
                 options["NSMainStoryboardFile"] = Options.StringOption.Get<Options.XCode.InfoPlist.NSMainStoryboardFile>(conf);
@@ -110,7 +110,7 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     Options.Option(Options.XCode.InfoPlist.UISupportsTrueScreenSizeOnMac.Disable, () => options["UISupportsTrueScreenSizeOnMac"] = "NO"),
                     Options.Option(Options.XCode.InfoPlist.UISupportsTrueScreenSizeOnMac.Enable, () => options["UISupportsTrueScreenSizeOnMac"] = "YES")
                 );
-            #endregion // infoplist keys
+                #endregion // infoplist keys
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs
@@ -90,7 +90,7 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     Options.Option(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Enable, () => options["SupportsMacDesignedForIphoneIpad"] = "YES")
                 );
 
-            #region infoplist keys
+                #region infoplist keys
                 context.SelectOptionWithFallback(
                     () => options["LSRequiresIPhoneOS"] = FileGeneratorUtilities.RemoveLineTag,
                     Options.Option(Options.XCode.InfoPlist.LSRequiresIPhoneOS.Disable, () => options["LSRequiresIPhoneOS"] = "NO"),
@@ -228,7 +228,7 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     Options.Option(Options.XCode.InfoPlist.UIRequiresPersistentWiFi.Disable, () => options["UIRequiresPersistentWiFi"] = "NO"),
                     Options.Option(Options.XCode.InfoPlist.UIRequiresPersistentWiFi.Enable, () => options["UIRequiresPersistentWiFi"] = "YES")
                 );
-            #endregion //infoplist keys
+                #endregion //infoplist keys
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/tvOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/tvOsPlatform.cs
@@ -81,13 +81,13 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 options["SupportsMaccatalyst"] = FileGeneratorUtilities.RemoveLineTag;
                 options["SupportsMacDesignedForIphoneIpad"] = FileGeneratorUtilities.RemoveLineTag;
 
-            #region infoplist keys
+                #region infoplist keys
                 context.SelectOptionWithFallback(
                     () => options["UIAppSupportsHDR"] = FileGeneratorUtilities.RemoveLineTag,
                     Options.Option(Options.XCode.InfoPlist.UIAppSupportsHDR.Disable, () => options["UIAppSupportsHDR"] = "NO"),
                     Options.Option(Options.XCode.InfoPlist.UIAppSupportsHDR.Enable, () => options["UIAppSupportsHDR"] = "YES")
                 );
-            #endregion // infoplist keys
+                #endregion // infoplist keys
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake.UnitTests/TargetTests.cs b/Sharpmake.UnitTests/TargetTests.cs
@@ -108,8 +108,8 @@ public void HaveFragment_WithNonexistentField_ReturnsFalse()
         [Flags, Fragment]
         enum BogusFragment
         {
-            one = 1<<0,
-            two = 1<<1
+            one = 1 << 0,
+            two = 1 << 1
         }
 
         [TestCase(Optimization.Release, true)]

diff --git a/Sharpmake/Options.XCode.cs b/Sharpmake/Options.XCode.cs
@@ -944,14 +944,14 @@ public enum UIInterfaceOrientation
 
                 public class UIInterfaceOrientation_iPhone : WithArgOption<UIInterfaceOrientation>
                 {
-                     public UIInterfaceOrientation_iPhone(UIInterfaceOrientation value)
-                        : base(value) { }
+                    public UIInterfaceOrientation_iPhone(UIInterfaceOrientation value)
+                       : base(value) { }
                 }
 
                 public class UIInterfaceOrientation_iPad : WithArgOption<UIInterfaceOrientation>
                 {
-                     public UIInterfaceOrientation_iPad(UIInterfaceOrientation value)
-                        : base(value) { }
+                    public UIInterfaceOrientation_iPad(UIInterfaceOrientation value)
+                       : base(value) { }
                 }
 
                 public class UISupportedInterfaceOrientations : UniqueList<UIInterfaceOrientation>

diff --git a/Sharpmake/Target.cs b/Sharpmake/Target.cs
@@ -472,7 +472,7 @@ public bool HaveFragment<T>()
             var tType = typeof(T);
             return fragments.Any(fragment => fragment.FieldType == tType);
         }
-        
+
         public bool HaveFragmentOfSameType(object asFragment)
         {
             FieldInfo[] fragments = GetType().GetFields();

diff --git a/samples/CPPCLI/CLRTest.sharpmake.cs b/samples/CPPCLI/CLRTest.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019, 2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using System.Collections.Generic;

diff --git a/samples/CPPCLI/projects.sharpmake.cs b/samples/CPPCLI/projects.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019, 2021-2022 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using System.Collections.Generic;

diff --git a/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs b/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019, 2021-2022 Ubisoft Entertainment
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using Sharpmake;

diff --git a/samples/CSharpHelloWorld/common.sharpmake.cs b/samples/CSharpHelloWorld/common.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019-2022 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using Sharpmake;
 

diff --git a/samples/CSharpImports/CSharpImports.sharpmake.cs b/samples/CSharpImports/CSharpImports.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2020-2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using System.IO;

diff --git a/samples/CSharpImports/common.sharpmake.cs b/samples/CSharpImports/common.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2020-2022 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using Sharpmake;
 

diff --git a/samples/CSharpVsix/CSharpVsix.sharpmake.cs b/samples/CSharpVsix/CSharpVsix.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017-2019, 2021 Ubisoft Entertainment
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using Sharpmake;

diff --git a/samples/CSharpWCF/CSharpWCF.sharpmake.cs b/samples/CSharpWCF/CSharpWCF.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2018-2019, 2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using System.IO;

diff --git a/samples/CompileCommandDatabase/CompileCommandDatabase.sharpmake.cs b/samples/CompileCommandDatabase/CompileCommandDatabase.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2020-2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System.Collections.Generic;
 using System.IO;

diff --git a/samples/ConfigureOrder/ConfigureOrdering.sharpmake.cs b/samples/ConfigureOrder/ConfigureOrdering.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019, 2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using System;
 using Sharpmake;

diff --git a/samples/ConfigureOrder/Util.sharpmake.cs b/samples/ConfigureOrder/Util.sharpmake.cs
@@ -1,16 +1,5 @@
-// Copyright (c) 2017, 2019, 2021 Ubisoft Entertainment
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright (c) Ubisoft. All Rights Reserved.
+// Licensed under the Apache 2.0 License. See LICENSE.md in the project root for license information.
 
 using Sharpmake;