Merge develop-3.x.x into fix/csharp14-contains-ambiguity-universalrpctests

Author: netcode-ci-service

com.unity.netcode.gameobjects/Runtime/Components/Helpers/UnifiedBootstrap.cs

@@ -29,16 +29,16 @@ internal class UnifiedBootstrap : ClientServerBootstrap
 
         // Every ClientServerBootstrap constructor clears N4E's ServerWorlds and ClientWorlds, and each NetworkManager
         // creates its own bootstrap, so the worlds created for other NetworkManagers are registered again.
-        private static readonly List<NetcodeWorld> s_CreatedWorlds = new List<NetcodeWorld>();
+        private static readonly List<NetcodeWorld> k_CreatedWorlds = new List<NetcodeWorld>();
 
         private static void RegisterCreatedWorlds()
         {
-            for (int i = s_CreatedWorlds.Count - 1; i >= 0; i--)
+            for (int i = k_CreatedWorlds.Count - 1; i >= 0; i--)
             {
-                var world = s_CreatedWorlds[i];
+                var world = k_CreatedWorlds[i];
                 if (!world.IsCreated)
                 {
-                    s_CreatedWorlds.RemoveAt(i);
+                    k_CreatedWorlds.RemoveAt(i);
                     continue;
                 }
                 // A single world host is registered as both a server and a client world, the same as N4E does.
@@ -94,7 +94,7 @@ public override bool Initialize(string defaultWorldName)
                 }
 
                 networkManager.NetcodeWorld = (NetcodeWorld)world;
-                s_CreatedWorlds.Add(networkManager.NetcodeWorld);
+                k_CreatedWorlds.Add(networkManager.NetcodeWorld);
             }
             else
             {

dotnet-tools/netcode.standards/ExcludeGenerators.targets

@@ -0,0 +1,7 @@
+<Project>
+    <!-- dotnet format: skip Entities / Netcode for Entities source generators (slow, and they can't resolve the Unity project path outside the Editor) -->
+    <ItemGroup>
+        <Analyzer Remove="$(MSBuildProjectDirectory)/Library/PackageCache/com.unity.netcode@*/**/*.dll" />
+        <Analyzer Remove="$(MSBuildProjectDirectory)/Library/PackageCache/com.unity.entities@*/**/*.dll" />
+    </ItemGroup>
+</Project>

dotnet-tools/netcode.standards/Program.cs

@@ -33,6 +33,7 @@ private static int Main(
         foreach (var file in Directory.GetFiles(project, pattern))
         {
             var procInfo = new ProcessStartInfo("dotnet");
+            procInfo.Environment["CustomAfterMicrosoftCommonTargets"] = Path.Combine(AppContext.BaseDirectory, "ExcludeGenerators.targets");
 
             procInfo.Arguments = check
                 ? $"format whitespace {file} --no-restore --verify-no-changes --verbosity {verbosity}"

dotnet-tools/netcode.standards/netcode.standards.csproj

@@ -12,4 +12,8 @@
         <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
     </ItemGroup>
 
-</Project>
+    <ItemGroup>
+        <None Include="ExcludeGenerators.targets" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+
+</Project>