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

Rename solutioninfo to targetinfo #4

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Rename solutioninfo to targetinfo #4

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
24 changes: 12 additions & 12 deletions UWP/Debug Library/CLRCapabilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ public ClrInfoProperties(Version cv, string cvi, Version tfv)
}
}

public struct SolutionInfoProperties
public struct TargetInfoProperties
{
public readonly Version solutionVersion;
public readonly string solutionVendorInfo;
public readonly Version targetVersion;
public readonly string targetVendorInfo;

public SolutionInfoProperties(Version v, string i)
public TargetInfoProperties(Version v, string i)
{
solutionVersion = v;
solutionVendorInfo = i;
targetVersion = v;
targetVendorInfo = i;
}
}

Expand All @@ -126,13 +126,13 @@ public SolutionInfoProperties(Version v, string i)
private SoftwareVersionProperties m_swVersion;
private HalSystemInfoProperties m_halSystemInfo;
private ClrInfoProperties m_clrInfo;
private SolutionInfoProperties m_solutionReleaseInfo;
private TargetInfoProperties m_targetReleaseInfo;

private bool m_fUnknown;

public CLRCapabilities()
: this(Capability.None, new LCDCapabilities(), new SoftwareVersionProperties(),
new HalSystemInfoProperties(), new ClrInfoProperties(), new SolutionInfoProperties())
new HalSystemInfoProperties(), new ClrInfoProperties(), new TargetInfoProperties())
{
}

Expand All @@ -142,7 +142,7 @@ public CLRCapabilities(
SoftwareVersionProperties ver,
HalSystemInfoProperties halSystemInfo,
ClrInfoProperties clrInfo,
SolutionInfoProperties solutionReleaseInfo
TargetInfoProperties solutionReleaseInfo
)
{
m_fUnknown = (capability == Capability.None);
Expand All @@ -152,7 +152,7 @@ SolutionInfoProperties solutionReleaseInfo

m_halSystemInfo = halSystemInfo;
m_clrInfo = clrInfo;
m_solutionReleaseInfo = solutionReleaseInfo;
m_targetReleaseInfo = solutionReleaseInfo;
}

public HalSystemInfoProperties HalSystemInfo
Expand All @@ -173,12 +173,12 @@ public ClrInfoProperties ClrInfo
}
}

public SolutionInfoProperties SolutionReleaseInfo
public TargetInfoProperties SolutionReleaseInfo
{
get
{
Debug.Assert(!m_fUnknown);
return m_solutionReleaseInfo;
return m_targetReleaseInfo;
}
}

Expand Down
4 changes: 2 additions & 2 deletions UWP/Debug Library/MFDeployTool/NanoFrameworkDeviceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ public System.Version TargetFrameworkVersion

public System.Version SolutionBuildVersion
{
get { return Dbg.Capabilities.SolutionReleaseInfo.solutionVersion; }
get { return Dbg.Capabilities.SolutionReleaseInfo.targetVersion; }
}

public string SolutionBuildInfo
{
get { return Dbg.Capabilities.SolutionReleaseInfo.solutionVendorInfo; }
get { return Dbg.Capabilities.SolutionReleaseInfo.targetVendorInfo; }
}

public IAppDomainInfo[] AppDomains
Expand Down
2 changes: 1 addition & 1 deletion UWP/Debug Library/WireProtocol/Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ public class LCD
}
public class SoftwareVersion
{
public byte[] m_buildDate = new byte[20];
public byte[] m_buildDate = new byte[22];
public uint m_compilerVersion;
}

Expand Down
2 changes: 1 addition & 1 deletion UWP/Debug Library/WireProtocol/Converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private void InternalSerializeInstance(BinaryWriter writer, object o)

private void Deserialize(Stream stream, object o)
{
BinaryReader reader = new BinaryReader(stream, Encoding.Unicode);
BinaryReader reader = new BinaryReader(stream, Encoding.UTF8);

InternalDeserializeFields(reader, o);
}
Expand Down
26 changes: 13 additions & 13 deletions UWP/Debug Library/WireProtocol/Engine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ public async Task<bool> ConnectAsync(int retries, int timeout, bool force = fals
}
}

//if ((force || Capabilities.IsUnknown) && ConnectionSource == ConnectionSource.nanoCLR)
//{
// Capabilities = await DiscoverCLRCapabilitiesAsync().ConfigureAwait(false);
// m_ctrl.Capabilities = Capabilities;
//}
if ((force || Capabilities.IsUnknown) && ConnectionSource == ConnectionSource.NanoCLR)
{
Capabilities = await DiscoverCLRCapabilitiesAsync().ConfigureAwait(false);
m_ctrl.Capabilities = Capabilities;
}

if (connectionSource != ConnectionSource.Unknown && connectionSource != ConnectionSource)
{
Expand Down Expand Up @@ -2437,30 +2437,30 @@ private async Task<uint> DiscoverCLRCapabilityUintAsync(uint caps)
return clrInfoProps;
}

private async Task<CLRCapabilities.SolutionInfoProperties> DiscoverSolutionInfoPropertiesAsync()
private async Task<CLRCapabilities.TargetInfoProperties> DiscoverTargetInfoPropertiesAsync()
{
Debug.WriteLine("==============================");
Debug.WriteLine("DiscoverSolutionInfoProperties");
Debug.WriteLine("DiscoverTargetInfoProperties");

IncomingMessage reply = await DiscoverCLRCapabilityAsync(Commands.Debugging_Execution_QueryCLRCapabilities.c_CapabilitySolutionReleaseInfo).ConfigureAwait(false);

ReleaseInfo solutionInfo = new ReleaseInfo();
ReleaseInfo targetInfo = new ReleaseInfo();

CLRCapabilities.SolutionInfoProperties solInfProps = new CLRCapabilities.SolutionInfoProperties();
CLRCapabilities.TargetInfoProperties targetInfoProps = new CLRCapabilities.TargetInfoProperties();

if (reply != null)
{
Commands.Debugging_Execution_QueryCLRCapabilities.Reply cmdReply = reply.Payload as Commands.Debugging_Execution_QueryCLRCapabilities.Reply;

if (cmdReply != null && cmdReply.m_data != null)
{
new Converter().Deserialize(solutionInfo, cmdReply.m_data);
new Converter().Deserialize(targetInfo, cmdReply.m_data);

solInfProps = new CLRCapabilities.SolutionInfoProperties(solutionInfo.Version, solutionInfo.Info);
targetInfoProps = new CLRCapabilities.TargetInfoProperties(targetInfo.Version, targetInfo.Info);
}
}

return solInfProps;
return targetInfoProps;
}

private async Task<CLRCapabilities> DiscoverCLRCapabilitiesAsync()
Expand All @@ -2470,7 +2470,7 @@ private async Task<CLRCapabilities> DiscoverCLRCapabilitiesAsync()
var softwareVersion = await DiscoverSoftwareVersionPropertiesAsync().ConfigureAwait(false);
var halSysInfo = await DiscoverHalSystemInfoPropertiesAsync().ConfigureAwait(false);
var clrInfo = await DiscoverClrInfoPropertiesAsync().ConfigureAwait(false);
var solutionInfo = await DiscoverSolutionInfoPropertiesAsync().ConfigureAwait(false);
var solutionInfo = await DiscoverTargetInfoPropertiesAsync().ConfigureAwait(false);

return new CLRCapabilities(clrFlags, clrLcd, softwareVersion, halSysInfo, clrInfo, solutionInfo);
}
Expand Down