Incremental compiler compatibility fixes (#52)

* Catch exception during weaving when .pdb is locked * Allow built-in types from netstandard.dll * Revert whitespace changes in 56d2164
MirrorNetworking · Oct 6, 2018 · b531b4d · b531b4d
1 parent 30ade03
commit b531b4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Mirror/Weaver/UNetBehaviourProcessor.cs b/Mirror/Weaver/UNetBehaviourProcessor.cs
@@ -2036,7 +2036,8 @@ void ProcessSyncVars()
                             fieldModuleName != Weaver.m_UnityAssemblyDefinition.MainModule.Name &&
                             fieldModuleName != Weaver.m_UNetAssemblyDefinition.MainModule.Name &&
                             fieldModuleName != Weaver.corLib.Name &&
-                            fieldModuleName != "System.Runtime.dll" // this is only for Metro, built-in types are not in corlib on metro
+                            fieldModuleName != "System.Runtime.dll" && // this is only for Metro, built-in types are not in corlib on metro
+                            fieldModuleName != "netstandard.dll" // handle built-in types when weaving new C#7 compiler assemblies
                             )
                         {
                             Log.Error("SyncVar [" + fd.FullName + "] from " + resolvedField.Module.ToString() + " cannot be a different module.");

diff --git a/Mirror/Weaver/Weaver.cs b/Mirror/Weaver/Weaver.cs
@@ -1868,7 +1868,16 @@ static bool Weave(string assName, IEnumerable<string> dependencies, IAssemblyRes
                     writeParams.SymbolWriterProvider = new MdbWriterProvider();
                     // old pdb file is out of date so delete it. symbols will be stored in mdb
                     var pdb = Path.ChangeExtension(assName, ".pdb");
-                    File.Delete(pdb);
+
+                    try
+                    {
+                        File.Delete(pdb);
+                    }
+                    catch (Exception ex)
+                    {
+                        // workaround until Unity fixes C#7 compiler compability with the UNET weaver
+                        UnityEngine.Debug.LogWarning($"Unable to delete file {pdb}: {ex.Message}");
+                    }
                 }
 
                 scriptDef.Write(dest, writeParams);