Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MTGOSDK/Core] Refactor Compiler, Remoting namespaces #22

Merged
merged 10 commits into from
Jul 15, 2024
Merged

[MTGOSDK/Core] Refactor Compiler, Remoting namespaces #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7cd3d76
[MTGOSDK/Core] Migrate IL.Emit to Compiler namespace
Qonfused Jul 13, 2024
882f9ac
Fix ILLink trimming of Newtonsoft.Json
Qonfused Jul 14, 2024
84761b7
[MTGOSDK/API/Play] Tournaments: Fix regression with round timer
Qonfused Jul 14, 2024
4c05f01
[MTGOSDK/lib] Diver: Add optional flag for debug console
Qonfused Jul 14, 2024
7d9cf29
[MTGOSDK/Core/Reflection] ListProxy: Expose local proxy for remote lists
Qonfused Jul 15, 2024
937efc7
[MTGOSDK.Tests] Cleanup API tests
Qonfused Jul 15, 2024
ad144ef
[MTGOSDK.Tests] Exclude runtime internal fields from coverage
Qonfused Jul 15, 2024
bb0858f
[MTGOSDK/Core/Reflection] TypeProxy: Expose detection method
Qonfused Jul 15, 2024
06a03df
[MTGOSDK/Core] Add GlobalUsings, separate attributes
Qonfused Jul 15, 2024
eb5164a
Update package versions, cleanup lockfile restore
Qonfused Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
Version="4.7.0" />
<!-- MTGOSDK/lib/ILRepack -->
<PackageVersion Include="ILRepack.Lib.MSBuild.Task"
Version="2.0.33" />
Version="2.0.34.1" />
<!-- MTGOSDK.MSBuild -->
<PackageVersion Include="Microsoft.Build.Utilities.Core"
Version="17.0.0" />
Version="17.10.4" />
<PackageVersion Include="JetBrains.Refasmer"
Version="1.0.33" />
<PackageVersion Include="Microsoft.ILVerification"
Expand All @@ -63,14 +63,14 @@
<PackageVersion Include="NUnit3TestAdapter"
Version="4.5.0" />
<PackageVersion Include="ReportGenerator"
Version="5.3.6" />
Version="5.3.8" />
</ItemGroup>

<!-- .NET Standard 2.0 -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<!-- Use API polyfills to help write .NET 5.0+ compatible code -->
<GlobalPackageReference Include="Meziantou.Polyfill"
Version="1.0.37"
Version="1.0.39"
PrivateAssets="all"
Condition="'$(EnablePolyfills)' != 'false'" />
<!-- For the .NET Standard TFM, we must provide the ILLink.Tasks package -->
Expand All @@ -95,7 +95,7 @@
Condition="'$(EnableSourceLink)' != 'false'" />
<ItemGroup Condition="'$(EnableSourceLink)' != 'false'">
<GlobalPackageReference Include="DotNet.ReproducibleBuilds"
Version="1.1.1"
Version="1.2.4"
PrivateAssets="All" />
<!--
Required for deterministic source paths.
Expand All @@ -112,7 +112,7 @@
<ItemGroup Condition="'$(IsPackable)' != 'false' And
'$(EnableSourceControlManagerQueries)' != 'false'">
<GlobalPackageReference Include="Nerdbank.GitVersioning"
Version="3.6.133"
Version="3.6.139"
PrivateAssets="All" />
</ItemGroup>

Expand Down
129 changes: 41 additions & 88 deletions MTGOSDK.MSBuild/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,9 @@
".NETStandard,Version=v2.0": {
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.1.1, )",
"resolved": "1.1.1",
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
"dependencies": {
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
"Microsoft.SourceLink.GitHub": "1.1.1",
"Microsoft.SourceLink.GitLab": "1.1.1"
}
"requested": "[1.2.4, )",
"resolved": "1.2.4",
"contentHash": "Ch9U74tQA2fQH+U0hcYH7WyIFUfAq7jrjgSHVu2FAcYiMBtbrCMyq2nGA/ZZnB2jSaUeOOYiCjxeaDVB7Ssbdw=="
},
"JetBrains.Refasmer": {
"type": "Direct",
Expand All @@ -26,17 +20,19 @@
},
"Microsoft.Build.Utilities.Core": {
"type": "Direct",
"requested": "[17.0.0, )",
"resolved": "17.0.0",
"contentHash": "+eqDvecetKfsZR9WqLQ96F9xhxFb3m9VOjkyzuaA/2D1cub1aW9XyegZb8+gEpBa+o7dHnIN9FskC+tRXtqLSQ==",
"dependencies": {
"Microsoft.Build.Framework": "17.0.0",
"Microsoft.NET.StringTools": "1.0.0",
"Microsoft.Win32.Registry": "4.3.0",
"System.Collections.Immutable": "5.0.0",
"System.Configuration.ConfigurationManager": "4.7.0",
"System.Security.Permissions": "4.7.0",
"System.Text.Encoding.CodePages": "4.0.1"
"requested": "[17.10.4, )",
"resolved": "17.10.4",
"contentHash": "eEB/tcXkSV+nQgvoa/l53UPtn+KVtKZ8zBceDZsXVTrfE4fA+4+/olrx9W8n2tq4XiESsL9UuGJgCKzqBwQCoQ==",
"dependencies": {
"Microsoft.Build.Framework": "17.10.4",
"Microsoft.NET.StringTools": "17.10.4",
"Microsoft.Win32.Registry": "5.0.0",
"System.Collections.Immutable": "8.0.0",
"System.Configuration.ConfigurationManager": "8.0.0",
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Security.Principal.Windows": "5.0.0",
"System.Text.Encoding.CodePages": "7.0.0"
}
},
"Microsoft.ILVerification": {
Expand All @@ -60,9 +56,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.6.133, )",
"resolved": "3.6.133",
"contentHash": "VZWMd5YAeDxpjWjAP/X6bAxnRMiEf6tES/ITN0X5CHJgkWLLeHGmEALivmTAfYM6P+P/3Szy6VCITUAkqjcHVw=="
"requested": "[3.6.139, )",
"resolved": "3.6.139",
"contentHash": "rq0Ub/Jik7PtMtZtLn0tHuJ01Yt36RQ+eeBe+S7qnJ/EFOX6D4T9zuYD3vQPYKGI6Ro4t2iWgFm3fGDgjBrMfg=="
},
"NETStandard.Library": {
"type": "Direct",
Expand All @@ -75,10 +71,13 @@
},
"Microsoft.Build.Framework": {
"type": "Transitive",
"resolved": "17.0.0",
"contentHash": "XbFA0z+6Ws2pNeRXYcDF3lKlNgRoSGMm2Q5HKzZD+EbwYMKPKrl/BJnnkMuDJHU0KravYHfhzBnLLJpPeZ3E7A==",
"resolved": "17.10.4",
"contentHash": "4qXCwNOXBR1dyCzuks9SwTwFJQO/xmf2wcMislotDWJu7MN/r3xDNoU8Ae5QmKIHPaLG1xmfDkYS7qBVzxmeKw==",
"dependencies": {
"System.Security.Permissions": "4.7.0"
"Microsoft.Win32.Registry": "5.0.0",
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Security.Principal.Windows": "5.0.0"
}
},
"Microsoft.Build.Tasks.Git": {
Expand Down Expand Up @@ -140,11 +139,11 @@
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==",
"resolved": "17.10.4",
"contentHash": "wyABaqY+IHCMMSTQmcc3Ca6vbmg5BaEPgicnEgpll+4xyWZWlkQqUwafweUd9VAhBb4jqplMl6voUHQ6yfdUcg==",
"dependencies": {
"System.Memory": "4.5.4",
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"Microsoft.NETCore.Platforms": {
Expand All @@ -157,38 +156,11 @@
"resolved": "1.1.0",
"contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
},
"Microsoft.SourceLink.AzureRepos.Git": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.SourceLink.Bitbucket.Git": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
},
"Microsoft.SourceLink.GitLab": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
"resolved": "4.3.0",
Expand Down Expand Up @@ -338,20 +310,19 @@
},
"System.Collections.Immutable": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
"resolved": "8.0.0",
"contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==",
"dependencies": {
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Configuration.ConfigurationManager": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==",
"resolved": "8.0.0",
"contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==",
"dependencies": {
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Security.Permissions": "4.7.0"
"System.Security.Cryptography.ProtectedData": "8.0.0"
}
},
"System.Console": {
Expand Down Expand Up @@ -840,10 +811,10 @@
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==",
"resolved": "8.0.0",
"contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==",
"dependencies": {
"System.Memory": "4.5.3"
"System.Memory": "4.5.5"
}
},
"System.Security.Cryptography.X509Certificates": {
Expand Down Expand Up @@ -878,14 +849,6 @@
"runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
}
},
"System.Security.Permissions": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==",
"dependencies": {
"System.Security.AccessControl": "4.7.0"
}
},
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
Expand All @@ -903,21 +866,11 @@
},
"System.Text.Encoding.CodePages": {
"type": "Transitive",
"resolved": "4.3.0",
"contentHash": "IRiEFUa5b/Gs5Egg8oqBVoywhtOeaO2KOx3j0RfcYY/raxqBuEK7NXRDgOwtYM8qbi+7S4RPXUbNt+ZxyY0/NQ==",
"resolved": "7.0.0",
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"System.Collections": "4.3.0",
"System.Globalization": "4.3.0",
"System.IO": "4.3.0",
"System.Reflection": "4.3.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
"System.Runtime.Handles": "4.3.0",
"System.Runtime.InteropServices": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Threading": "4.3.0"
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Encoding.Extensions": {
Expand Down
13 changes: 1 addition & 12 deletions MTGOSDK.Tests/MTGOSDK.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PropertyGroup>
<CollectCoverage>true</CollectCoverage>
<CoverletOutputFormat>cobertura</CoverletOutputFormat>
<ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
<ExcludeByAttribute>GeneratedCodeAttribute,RuntimeInternalAttribute</ExcludeByAttribute>
<!-- <Threshold>80</Threshold>
<ThresholdType>line</ThresholdType> -->
</PropertyGroup>
Expand All @@ -45,17 +45,6 @@
<ClassFilters_Exclude>
-MTGOSDK.API.Events;
-MTGOSDK.API.Interface.*;
<!-- -MTGOSDK.Core.Exceptions.*;
-MTGOSDK.Core.Logging.*;
-MTGOSDK.Core.Reflection.Emit.*;
-MTGOSDK.Core.Reflection.Snapshot.*;
-MTGOSDK.Core.Remoting.Internal.*;
-MTGOSDK.Core.Remoting.Interop.*;
-MTGOSDK.Resources.*;
-MTGOSDK.Win32.API.*;
-MTGOSDK.Win32.Extensions.*;
-MTGOSDK.Win32.Injection.*;
-MTGOSDK.Win32.Utilities.* -->
</ClassFilters_Exclude>
</PropertyGroup>

Expand Down
51 changes: 9 additions & 42 deletions MTGOSDK.Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.1.1, )",
"resolved": "1.1.1",
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
"dependencies": {
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
"Microsoft.SourceLink.GitHub": "1.1.1",
"Microsoft.SourceLink.GitLab": "1.1.1"
}
"requested": "[1.2.4, )",
"resolved": "1.2.4",
"contentHash": "Ch9U74tQA2fQH+U0hcYH7WyIFUfAq7jrjgSHVu2FAcYiMBtbrCMyq2nGA/ZZnB2jSaUeOOYiCjxeaDVB7Ssbdw=="
},
"Microsoft.Extensions.Logging": {
"type": "Direct",
Expand Down Expand Up @@ -53,9 +47,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.6.133, )",
"resolved": "3.6.133",
"contentHash": "VZWMd5YAeDxpjWjAP/X6bAxnRMiEf6tES/ITN0X5CHJgkWLLeHGmEALivmTAfYM6P+P/3Szy6VCITUAkqjcHVw=="
"requested": "[3.6.139, )",
"resolved": "3.6.139",
"contentHash": "rq0Ub/Jik7PtMtZtLn0tHuJ01Yt36RQ+eeBe+S7qnJ/EFOX6D4T9zuYD3vQPYKGI6Ro4t2iWgFm3fGDgjBrMfg=="
},
"NUnit": {
"type": "Direct",
Expand All @@ -77,9 +71,9 @@
},
"ReportGenerator": {
"type": "Direct",
"requested": "[5.3.6, )",
"resolved": "5.3.6",
"contentHash": "cFmyBJGbD4eaE/qkwMclhcgqgrqktb0WmiZ8kt8i4ahIq5fr7SNVjVtAorbbh43vAXtvGPtD/ZUHZYqtAywM4A=="
"requested": "[5.3.8, )",
"resolved": "5.3.8",
"contentHash": "F+JLYA1c3uXMob8f8Wx6APRzZyvcsr5NVGsQOApBeOsyu1rZamWkfb68akm4aR5rfRXMytZsPGFou8xDJV+IcQ=="
},
"Dynamitey": {
"type": "Transitive",
Expand Down Expand Up @@ -159,38 +153,11 @@
"resolved": "1.1.0",
"contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
},
"Microsoft.SourceLink.AzureRepos.Git": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.SourceLink.Bitbucket.Git": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
},
"Microsoft.SourceLink.GitLab": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "17.10.0",
Expand Down
2 changes: 1 addition & 1 deletion MTGOSDK.Tests/src/Tests/Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void ValidateLeague(League league)
Assert.That(league.MinMatches, Is.GreaterThanOrEqualTo(3));
Assert.That((bool?)league.IsPaused, Is.Not.Null);

foreach(LeaderboardEntry entry in league.Leaderboard)
foreach(LeaderboardEntry entry in league.Leaderboard.Take(5))
{
Assert.That(entry.Name, Is.Not.Empty);
Assert.That(entry.TrophyCount, Is.GreaterThanOrEqualTo(0));
Expand Down
Loading
Loading