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

Create release 6.3.2 #609 #610

Merged
merged 1 commit into from
May 20, 2021
Merged

Create release 6.3.2 #609 #610

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
6 changes: 6 additions & 0 deletions SemanticData/AddressSpaceComplianceTestTool/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,32 @@
<source name="AddressSpacePrototyping" switchValue="All" switchType="System.Diagnostics.SourceSwitch">
<listeners>
<add name="LogFile" />
<add name="WarningFile" />
<add name="configConsoleListener" />
<remove name="Default" />
</listeners>
</source>
<source name="UAModelDesignExport" switchValue="All" switchType="System.Diagnostics.SourceSwitch">
<listeners>
<add name="LogFile" />
<add name="WarningFile" />
<add name="configConsoleListener" />
<remove name="Default" />
</listeners>
</source>
<source name="UANodeSetValidation" switchValue="All" switchType="System.Diagnostics.SourceSwitch">
<listeners>
<add name="LogFile" />
<add name="WarningFile" />
<add name="configConsoleListener" />
<remove name="Default" />
</listeners>
</source>
</sources>
<sharedListeners>
<add name="WarningFile" type="System.Diagnostics.DelimitedListTraceListener" initializeData="asp.warnings.log" traceOutputOptions="DateTime">
<filter type="System.Diagnostics.EventTypeFilter" initializeData="Information" />
</add>
<add name="LogFile" type="System.Diagnostics.DelimitedListTraceListener" initializeData="asp.log" traceOutputOptions="DateTime">
<filter type="System.Diagnostics.EventTypeFilter" initializeData="All" />
</add>
Expand Down
24 changes: 21 additions & 3 deletions SemanticData/AddressSpaceComplianceTestTool/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace UAOOI.SemanticData.AddressSpacePrototyping
public class Program
{
#region public API

public static void Main(string[] args)
{
Program program = new Program();
Expand Down Expand Up @@ -94,8 +95,9 @@ internal void Do(Options options, IAddressSpaceContext addressSpace)
}
}

internal ITraceSource DebugITraceSource { set => TraceSource = value; }
#endregion
internal ITraceSource DebugITraceSource { set => TraceSource = value; }

#endregion public API

#region private

Expand All @@ -114,7 +116,23 @@ private void Execute(string[] args)

private async Task Heartbeat()
{
await Task.Run(async () => { while (Running) { await Task.Delay(1000); Console.Write("."); } });
await Task.Run(async () =>
{
int counter = 0;
while (Running)
{
await Task.Delay(1000);
Console.Write("\r");
if (counter % 2 == 0 )
Console.Write(@"\");
else
Console.Write("/");
counter++;
}
TraceSource.TraceData(TraceEventType.Verbose, 918215642, $"Execution time = {counter}s");
Console.WriteLine();
Console.WriteLine($"Execution time = {counter}s");
});
}

private void HandleErrors(IEnumerable<Error> errors)
Expand Down
2 changes: 1 addition & 1 deletion SemanticData/UANodeSetValidation/AddressSpaceContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Uri IAddressSpaceContext.ImportUANodeSet(FileInfo model)
{
if (model == null)
throw new ArgumentNullException("model", "the model cannot be null");
m_TraceEvent.TraceData( TraceEventType.Information, 190380256, "Starting model import form file {model.Name}");
m_TraceEvent.TraceData( TraceEventType.Information, 190380256, $"Starting model import form file {model.Name}");
if (!model.Exists)
throw new FileNotFoundException("The imported file does not exist", model.FullName);
UANodeSet _nodeSet = UANodeSet.ReadModelFile(model);
Expand Down
2 changes: 1 addition & 1 deletion SemanticData/UANodeSetValidation/XML/UAModelContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private UAModelContext(IUANodeSetModelHeader modelHeader, INamespaceTable addres
if (modelHeader.ServerUris != null && modelHeader.ServerUris.Length > 0)
traceEvent(TraceMessage.BuildErrorTraceMessage(BuildError.NotSupportedFeature, "ServerUris is omitted during the import"));
if (modelHeader.Extensions != null && modelHeader.Extensions.Length > 0)
traceEvent(TraceMessage.BuildErrorTraceMessage(BuildError.NotSupportedFeature, "Extensions is omitted during the import"));
traceEvent(TraceMessage.BuildErrorTraceMessage(BuildError.NotSupportedFeature, "Extensions are omitted during the import"));
_logTraceMessage = traceEvent ?? throw new ArgumentNullException(nameof(traceEvent));
_addressSpaceContext = addressSpaceContext ?? throw new ArgumentNullException(nameof(addressSpaceContext));
}
Expand Down