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

Jump to bottom

Work TargetName and Platform properties #200

Merged
merged 1 commit into from
Jun 20, 2019
Merged

Work TargetName and Platform properties #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/nanoFramework.Tools.DebugLibrary.Shared/CLRCapabilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ public struct TargetInfoProperties
public readonly Version Version;
public readonly string VendorInfo;
public readonly string TargetName;
public readonly string PlatformName;
public readonly string Platform;

public TargetInfoProperties(Version version, string info, string target, string platform)
{
Version = version;
VendorInfo = info.TrimEnd('\0');
TargetName = target.TrimEnd('\0');
PlatformName = platform.TrimEnd('\0');
Platform = platform.TrimEnd('\0');
}
}

Expand Down
2 changes: 2 additions & 0 deletions source/nanoFramework.Tools.DebugLibrary.Shared/MFDeployTool/INanoFrameworkDeviceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public interface INanoFrameworkDeviceInfo
byte OEM { get; }
byte Model { get; }
ushort SKU { get; }
string TargetName { get; }
string Platform { get; }
string ModuleSerialNumber { get; }
string SystemSerialNumber { get; }
System.Version ClrBuildVersion { get; }
Expand Down
6 changes: 3 additions & 3 deletions source/nanoFramework.Tools.DebugLibrary.Shared/MFDeployTool/NanoFrameworkDeviceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ public string TargetName
get { return Dbg.Capabilities.SolutionReleaseInfo.TargetName; }
}

public string PlatformName
public string Platform
{
get { return Dbg.Capabilities.SolutionReleaseInfo.PlatformName; }
get { return Dbg.Capabilities.SolutionReleaseInfo.Platform; }
}

public IAppDomainInfo[] AppDomains
Expand Down Expand Up @@ -216,7 +216,7 @@ public override string ToString()

output.AppendLine($"HAL build info: {HalBuildVersion?.ToString()}, {HalBuildInfo}");
output.AppendLine($"Target: {TargetName?.ToString()}");
output.AppendLine($"Platform: {PlatformName?.ToString()}");
output.AppendLine($"Platform: {Platform?.ToString()}");
output.AppendLine();
output.AppendLine($"Image build @ { ImageBuildDate } { ImageCompilerInfo } v{ ImageCompilerVersion.ToString() }");
output.AppendLine();
Expand Down
2 changes: 1 addition & 1 deletion source/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.2.0-preview.{height}",
"version": "1.2.1-preview.{height}",
"buildNumberOffset": 10,
"assemblyVersion": {
"precision": "revision"
Expand Down