Merge remote-tracking branch 'origin/master' into 2021.11.9

# Conflicts: # AmongUs.props # Reactor.Debugger/packages.lock.json # Reactor.Example/packages.lock.json # Reactor/packages.lock.json
NuclearPowered · Nov 20, 2021 · 8e8beaf · 8e8beaf
2 parents d9e5e7f + d92447a
commit 8e8beaf
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/AmongUs.props b/AmongUs.props
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.515" />
+        <PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.521" />
         <PackageReference Include="AmongUs.GameLibs.$(GamePlatform)" Version="$(GameVersion)" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.0.1" PrivateAssets="all" />

diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json
@@ -16,11 +16,11 @@
       },
       "BepInEx.IL2CPP": {
         "type": "Direct",
-        "requested": "[6.0.0-be.515, )",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==",
+        "requested": "[6.0.0-be.521, )",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
         "dependencies": {
-          "BepInEx.Core": "6.0.0-be.515",
+          "BepInEx.Core": "6.0.0-be.521",
           "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
           "HarmonyX": "2.5.7",
           "Iced": "1.15.0",
@@ -40,8 +40,8 @@
       },
       "BepInEx.Core": {
         "type": "Transitive",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
         "dependencies": {
           "HarmonyX": "2.5.7",
           "MonoMod.Utils": "21.10.10.1",
@@ -472,7 +472,7 @@
       "reactor": {
         "type": "Project",
         "dependencies": {
-          "BepInEx.IL2CPP": "6.0.0-be.515"
+          "BepInEx.IL2CPP": "6.0.0-be.521"
         }
       }
     }

diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json
@@ -16,11 +16,11 @@
       },
       "BepInEx.IL2CPP": {
         "type": "Direct",
-        "requested": "[6.0.0-be.515, )",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==",
+        "requested": "[6.0.0-be.521, )",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
         "dependencies": {
-          "BepInEx.Core": "6.0.0-be.515",
+          "BepInEx.Core": "6.0.0-be.521",
           "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
           "HarmonyX": "2.5.7",
           "Iced": "1.15.0",
@@ -40,8 +40,8 @@
       },
       "BepInEx.Core": {
         "type": "Transitive",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
         "dependencies": {
           "HarmonyX": "2.5.7",
           "MonoMod.Utils": "21.10.10.1",
@@ -472,7 +472,7 @@
       "reactor": {
         "type": "Project",
         "dependencies": {
-          "BepInEx.IL2CPP": "6.0.0-be.515"
+          "BepInEx.IL2CPP": "6.0.0-be.521"
         }
       }
     }

diff --git a/Reactor/Reactor.csproj b/Reactor/Reactor.csproj
@@ -24,7 +24,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json
@@ -16,11 +16,11 @@
       },
       "BepInEx.IL2CPP": {
         "type": "Direct",
-        "requested": "[6.0.0-be.515, )",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==",
+        "requested": "[6.0.0-be.521, )",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
         "dependencies": {
-          "BepInEx.Core": "6.0.0-be.515",
+          "BepInEx.Core": "6.0.0-be.521",
           "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
           "HarmonyX": "2.5.7",
           "Iced": "1.15.0",
@@ -40,18 +40,18 @@
       },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
-        "requested": "[1.0.0, )",
-        "resolved": "1.0.0",
-        "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
         "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.0.0",
-          "Microsoft.SourceLink.Common": "1.0.0"
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
         }
       },
       "BepInEx.Core": {
         "type": "Transitive",
-        "resolved": "6.0.0-be.515",
-        "contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==",
+        "resolved": "6.0.0-be.521",
+        "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
         "dependencies": {
           "HarmonyX": "2.5.7",
           "MonoMod.Utils": "21.10.10.1",
@@ -126,8 +126,8 @@
       },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
+        "resolved": "1.1.1",
+        "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
       },
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
@@ -141,8 +141,8 @@
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
+        "resolved": "1.1.1",
+        "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
       },
       "Mono.Cecil": {
         "type": "Transitive",