diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7223bccec..7ade6234a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -94,9 +94,9 @@ jobs: - name: Run ST.Client.Desktop.UnitTest run: dotnet test ./tests/ST.Client.Desktop.UnitTest/ST.Client.Desktop.UnitTest.csproj -c "${{ matrix.configuration }}" -# - name: dotnet ST.Client.Desktop.UnitTest test -# if: matrix.os != 'windows-latest' -# run: dotnet test ./tests/ST.Client.Desktop.UnitTest/ST.Client.Desktop.UnitTest.csproj + - name: dotnet ST.Client.Desktop.UnitTest test + if: matrix.os != 'windows-latest' + run: dotnet test ./tests/ST.Client.Desktop.UnitTest/ST.Client.Desktop.UnitTest.csproj - name: Get Short CommitId if: ${{ matrix.os == 'windows-latest' && !startsWith(github.ref, 'refs/tags/') && github.event_name == 'push' }} diff --git a/src/ST.Client.Android.ResSecrets/PlatformResSecrets.cs b/src/ST.Client.Android.ResSecrets/PlatformResSecrets.cs index 43cb0832e..f1dbd03e3 100644 --- a/src/ST.Client.Android.ResSecrets/PlatformResSecrets.cs +++ b/src/ST.Client.Android.ResSecrets/PlatformResSecrets.cs @@ -3,9 +3,9 @@ using static System.Application.Security.ResSecrets; namespace System.Application.Security { - public static class PlatformResSecrets + internal static class PlatformResSecrets { - public static string? GetResValue(string name, bool isSingle, ResValueFormat format, string namespacePrefix = Prefix_Res, Assembly? assembly = null) + internal static string? GetResValue(string name, bool isSingle, ResValueFormat format, string namespacePrefix = Prefix_Res, Assembly? assembly = null) { assembly ??= typeof(PlatformResSecrets).Assembly; return ResSecrets.GetResValue(name, isSingle, format, namespacePrefix, assembly); diff --git a/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj b/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj index 5d4ffd15b..c1d01c166 100644 --- a/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj +++ b/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj @@ -50,6 +50,7 @@ + diff --git a/src/ST.Client.ResSecrets/Properties/InternalsVisibleTo.cs b/src/ST.Client.ResSecrets/Properties/InternalsVisibleTo.cs index 8bb9b54d6..4978c0e88 100644 --- a/src/ST.Client.ResSecrets/Properties/InternalsVisibleTo.cs +++ b/src/ST.Client.ResSecrets/Properties/InternalsVisibleTo.cs @@ -1,15 +1,15 @@ -//using System.Runtime.CompilerServices; -//using static System.Properties.ThisAssembly; +using System.Runtime.CompilerServices; +using static System.Properties.ThisAssembly; -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Android.ResSecrets" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.iOS.ResSecrets" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Linux.ResSecrets" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Mac.ResSecrets" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Windows.ResSecrets" + PublicKey)] -//[assembly: InternalsVisibleTo("Xamarin.Forms.Platform.Android.UnitTests" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.iOS" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Mac" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Windows" + PublicKey)] -//[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Linux" + PublicKey)] -//[assembly: InternalsVisibleTo("Assembly-CSharp" + PublicKey)] -//[assembly: InternalsVisibleTo("Steam++" + PublicKey)] \ No newline at end of file +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Android.ResSecrets" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.iOS.ResSecrets" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Linux.ResSecrets" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Mac.ResSecrets" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Windows.ResSecrets" + PublicKey)] +[assembly: InternalsVisibleTo("Xamarin.Forms.Platform.Android.UnitTests" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.iOS" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Mac" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Windows" + PublicKey)] +[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Linux" + PublicKey)] +[assembly: InternalsVisibleTo("Assembly-CSharp" + PublicKey)] +[assembly: InternalsVisibleTo("Steam++" + PublicKey)] \ No newline at end of file diff --git a/src/ST.Client.ResSecrets/ResSecrets.cs b/src/ST.Client.ResSecrets/ResSecrets.cs index 53f025a2e..f5edd1329 100644 --- a/src/ST.Client.ResSecrets/ResSecrets.cs +++ b/src/ST.Client.ResSecrets/ResSecrets.cs @@ -5,12 +5,12 @@ using _ThisAssembly = System.Properties.ThisAssembly; namespace System.Application.Security { - public static class ResSecrets + internal static class ResSecrets { public const string Prefix_UIRes = "System.Application.UI.Resources."; public const string Prefix_Res = "System.Application.Resources."; - public static string? GetResValue(string name, bool isSingle, ResValueFormat format, string namespacePrefix = Prefix_UIRes, Assembly? assembly = null) + internal static string? GetResValue(string name, bool isSingle, ResValueFormat format, string namespacePrefix = Prefix_UIRes, Assembly? assembly = null) { assembly ??= Assembly.GetExecutingAssembly(); Stream? func(string x) => assembly.GetManifestResourceStream(x); @@ -18,7 +18,7 @@ namespace System.Application.Security return r; } - public enum ResValueFormat : byte + internal enum ResValueFormat : byte { String, StringGuidD,