Skip to content

Commit f2b8046

Browse files
barnsteebarnstee
committed
Update NuGets and remove obsolete code.
1 parent 9590d31 commit f2b8046

File tree

3 files changed

+6
-113
lines changed

3 files changed

+6
-113
lines changed

‎Applications/Controllers/BrowserController.cs

+2-52
Original file line numberDiff line numberDiff line change
@@ -139,56 +139,6 @@ public ActionResult Privacy()
139139
return View("Privacy");
140140
}
141141

142-
public ActionResult GenerateAAS()
143-
{
144-
try
145-
{
146-
string packagePath = Path.Combine(Directory.GetCurrentDirectory(), "UANodeSet.aasx");
147-
using (Package package = Package.Open(packagePath, FileMode.Create))
148-
{
149-
// add package origin part
150-
PackagePart origin = package.CreatePart(new Uri("/aasx/aasx-origin", UriKind.Relative), MediaTypeNames.Text.Plain, CompressionOption.Maximum);
151-
using (Stream fileStream = origin.GetStream(FileMode.Create))
152-
{
153-
var bytes = Encoding.ASCII.GetBytes("Intentionally empty.");
154-
fileStream.Write(bytes, 0, bytes.Length);
155-
}
156-
package.CreateRelationship(origin.Uri, TargetMode.Internal, "http://www.admin-shell.io/aasx/relationships/aasx-origin");
157-
158-
// add package spec part
159-
PackagePart spec = package.CreatePart(new Uri("/aasx/" + _nodeSetFilenames[0], UriKind.Relative), MediaTypeNames.Text.Xml);
160-
string submodelPath = Path.Combine(Directory.GetCurrentDirectory(), _nodeSetFilenames[0]);
161-
using (FileStream reader2 = new(submodelPath,FileMode.Open))
162-
{
163-
CopyStream(reader2, spec.GetStream());
164-
}
165-
166-
origin.CreateRelationship(spec.Uri, TargetMode.Internal, "http://www.admin-shell.io/aasx/relationships/aas-spec");
167-
}
168-
169-
return File(new FileStream(Path.Combine(Directory.GetCurrentDirectory(), "UANodeSet.aasx"), FileMode.Open, FileAccess.Read), "APPLICATION/octet-stream", "UANodeSet.aasx");
170-
}
171-
catch (Exception ex)
172-
{
173-
Trace.TraceError(ex.Message);
174-
175-
_session.StatusMessage = ex.Message;
176-
177-
return View("Error", _session);
178-
}
179-
}
180-
181-
private void CopyStream(Stream source, Stream target)
182-
{
183-
const int bufSize = 0x1000;
184-
byte[] buf = new byte[bufSize];
185-
int bytesRead = 0;
186-
while ((bytesRead = source.Read(buf, 0, bufSize)) > 0)
187-
{
188-
target.Write(buf, 0, bytesRead);
189-
}
190-
}
191-
192142
[HttpPost]
193143
public ActionResult Error(string errorMessage)
194144
{
@@ -502,12 +452,12 @@ private async Task StartServerAsync()
502452
ApplicationConfiguration config = await _application.LoadApplicationConfiguration(Path.Combine(Directory.GetCurrentDirectory(), "Application.Config.xml"), false).ConfigureAwait(false);
503453

504454
// check the application certificate.
505-
await _application.CheckApplicationInstanceCertificate(false, 0).ConfigureAwait(false);
455+
await _application.CheckApplicationInstanceCertificates(false, 0).ConfigureAwait(false);
506456

507457
// create cert validator
508458
config.CertificateValidator = new CertificateValidator();
509459
config.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(CertificateValidator_CertificateValidation);
510-
config.CertificateValidator.Update(config.SecurityConfiguration).GetAwaiter().GetResult();
460+
config.CertificateValidator.Update(config).GetAwaiter().GetResult();
511461

512462
// start the server.
513463
await _application.Start(new SimpleServer()).ConfigureAwait(false);

‎Applications/OpcSessionHelper.cs

+1-53
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public async Task<Session> GetSessionAsync(string sessionID, string endpointURL,
9292
OpcSessionCache.TryAdd(sessionID, newEntry);
9393
}
9494

95-
EndpointDescription selectedEndpoint = CoreClientUtils.SelectEndpoint(endpointURL, true);
95+
EndpointDescription selectedEndpoint = CoreClientUtils.SelectEndpoint(_app.ApplicationConfiguration, endpointURL, true);
9696
ConfiguredEndpoint configuredEndpoint = new ConfiguredEndpoint(null, selectedEndpoint, EndpointConfiguration.Create(_app.ApplicationConfiguration));
9797
uint timeout = (uint)_app.ApplicationConfiguration.ClientConfiguration.DefaultSessionTimeout;
9898

@@ -140,57 +140,5 @@ public async Task<Session> GetSessionAsync(string sessionID, string endpointURL,
140140

141141
return session;
142142
}
143-
144-
private EndpointDescriptionCollection DiscoverEndpoints(ApplicationConfiguration config, Uri discoveryUrl, int timeout)
145-
{
146-
EndpointConfiguration configuration = EndpointConfiguration.Create(config);
147-
configuration.OperationTimeout = timeout;
148-
149-
using (DiscoveryClient client = DiscoveryClient.Create(
150-
discoveryUrl,
151-
EndpointConfiguration.Create(config)))
152-
{
153-
EndpointDescriptionCollection endpoints = client.GetEndpoints(null);
154-
return ReplaceLocalHostWithRemoteHost(endpoints, discoveryUrl);
155-
}
156-
}
157-
158-
private EndpointDescription SelectUaTcpEndpoint(EndpointDescriptionCollection endpointCollection)
159-
{
160-
EndpointDescription bestEndpoint = null;
161-
foreach (EndpointDescription endpoint in endpointCollection)
162-
{
163-
if (endpoint.TransportProfileUri == Profiles.UaTcpTransport)
164-
{
165-
if ((bestEndpoint == null) ||
166-
(endpoint.SecurityLevel > bestEndpoint.SecurityLevel))
167-
{
168-
bestEndpoint = endpoint;
169-
}
170-
}
171-
}
172-
173-
return bestEndpoint;
174-
}
175-
176-
private EndpointDescriptionCollection ReplaceLocalHostWithRemoteHost(EndpointDescriptionCollection endpoints, Uri discoveryUrl)
177-
{
178-
EndpointDescriptionCollection updatedEndpoints = endpoints;
179-
180-
foreach (EndpointDescription endpoint in updatedEndpoints)
181-
{
182-
endpoint.EndpointUrl = Utils.ReplaceLocalhost(endpoint.EndpointUrl, discoveryUrl.DnsSafeHost);
183-
184-
StringCollection updatedDiscoveryUrls = new StringCollection();
185-
foreach (string url in endpoint.Server.DiscoveryUrls)
186-
{
187-
updatedDiscoveryUrls.Add(Utils.ReplaceLocalhost(url, discoveryUrl.DnsSafeHost));
188-
}
189-
190-
endpoint.Server.DiscoveryUrls = updatedDiscoveryUrls;
191-
}
192-
193-
return updatedEndpoints;
194-
}
195143
}
196144
}

‎Applications/UANodesetWebViewer.csproj

+3-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,9 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Azure.DigitalTwins.Core" Version="1.4.0" />
23-
<PackageReference Include="Azure.Identity" Version="1.12.1" />
24-
<PackageReference Include="Microsoft.Azure.Kusto.Data" Version="12.2.7" />
25-
<PackageReference Include="Microsoft.Azure.Kusto.Ingest" Version="12.2.7" />
26-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
27-
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
28-
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.374.124" />
29-
<PackageReference Include="System.IO.Packaging" Version="8.0.1" />
22+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.1" />
23+
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.375.443" />
24+
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.375.443" />
3025
</ItemGroup>
3126

3227
<ItemGroup>

0 commit comments

Comments
 (0)