administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

LightPT и TeacherPluginUtils.cs - ProcessorId убрал из за сбоя

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2023-02-26 00:12:16 +03:00
parent 4129ba6bb0
commit 8b24a037e3
9 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "8";
public const string Build = "3";
public const string Revision = "3247";
public const string Revision = "3250";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=8
%REVISION%=3247
%COREVERSION%=3
%REVISION%=3250
%MINOR%=8
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.3.3247
3.8.3.3250

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.3.3247'
!define VERSION '3.8.3.3250'

4
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -8586,9 +8586,9 @@ begin
if d > Result then Result := d;
end;
function Max(params a: array of integer): integer := a.Max;
//function Max(params a: array of integer): integer := a.Max;
function Max(params a: array of real): real := a.Max;
//function Max(params a: array of real): real := a.Max;
function Min(a, b: byte) := Math.Min(a, b);

3
TreeConverter/TreeRealization/type_table.cs
View file

@ -598,6 +598,7 @@ namespace PascalABCCompiler.TreeRealization
// еще где то надо проверять, что IEnumerable<Derived> -> IEnumerable<Base>, но здесь base_class предполагает,
// что это - класс, и рассматривает все его интерфейсы, упуская ситуацию, когда base_class - это и есть интерфейс
//else if ((cgitn != null || ctn != null) && (bcgitn != null || bcctn != null))
//else if (cgitn != null && (bcgitn != null || bcctn != null))
//else if ((cgitn != null || ctn != null) && bcgitn != null)
else if (cgitn != null && bcgitn != null)
{
@ -656,7 +657,7 @@ namespace PascalABCCompiler.TreeRealization
}
else if (interf is compiled_type_node ictn && base_class is compiled_type_node bctn)
{
if (ictn.compiled_type.AssemblyQualifiedName != null && ictn.compiled_type.AssemblyQualifiedName == bctn.compiled_type.AssemblyQualifiedName)
if (ictn.compiled_type.AssemblyQualifiedName != null && ictn.compiled_type.AssemblyQualifiedName == bctn.compiled_type.AssemblyQualifiedName)
{
implements = true;
break;

6
VisualPlugins/TraningControlPlugin/TeacherPluginUtils.cs
View file

@ -12,7 +12,7 @@ namespace VisualPascalABCPlugins
{
public static string ProcessorId()
{
var mbs = new ManagementObjectSearcher("Select ProcessorId From Win32_processor");
/*var mbs = new ManagementObjectSearcher("Select ProcessorId From Win32_processor");
var mbsList = mbs.Get();
foreach (ManagementObject mo in mbsList)
{
@ -20,8 +20,8 @@ namespace VisualPascalABCPlugins
if (pId != null)
return pId.ToString();
else return "AAAAAAAAAAAAAAAA";
}
return "";
}*/
return "AAAAAAAAAAAAAAAA";
}
public static byte[] Encrypt(string src)

7
bin/Lib/LightPT.pas
View file

@ -2,7 +2,7 @@
unit LightPT;
{$reference System.Net.Http.dll}
{$reference System.Security.dll}
{$reference System.Management.dll}
//{reference System.Management.dll}
uses __RedirectIOMode;
// Любые существенные изменения в этом модуле влияют на все Tasks, составленные всеми.
@ -244,7 +244,7 @@ end;
function ProcessorId: string;
begin
var mbs := new ManagementObjectSearcher('Select ProcessorId From Win32_processor');
{var mbs := new ManagementObjectSearcher('Select ProcessorId From Win32_processor');
var mbsList := mbs.Get();
Result := '';
foreach var mo: ManagementObject in mbsList do
@ -254,7 +254,8 @@ begin
Result := pId.ToString()
else Result := 'AAAAAAAAAAAAAAAA';
break;
end;
end;}
Result := 'AAAAAAAAAAAAAAAA';
end;
function Encrypt(src: string): array of byte; // записать в файл

4
bin/Lib/PABCSystem.pas
View file

@ -8586,9 +8586,9 @@ begin
if d > Result then Result := d;
end;
function Max(params a: array of integer): integer := a.Max;
//function Max(params a: array of integer): integer := a.Max;
function Max(params a: array of real): real := a.Max;
//function Max(params a: array of real): real := a.Max;
function Min(a, b: byte) := Math.Min(a, b);