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

Maintenance32005 #3

Merged
merged 3 commits into from
May 21, 2020
Merged

Maintenance32005 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a91009a
REmove dependency on CodeProtect #2
mpostol May 20, 2020
e1df2db
REmove dependency on CodeProtect #2
mpostol May 20, 2020
a9ea9c4
Remove dependency on CodeProtect #2
mpostol May 21, 2020
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
110 changes: 0 additions & 110 deletions ConfigurationEditor.Scripts/ConfigurationEditor.Scripts.csproj
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ConfigurationEditor.Scripts/CreateTag.cmd
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ConfigurationEditor.Scripts/CreateTag.tt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ConfigurationEditor.Scripts/CreateTagPrototyping.cs
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions ConfigurationEditor.Scripts/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions ConfigurationEditor.Scripts/Properties/AssemblyInfo.tt
View file
Open in desktop

This file was deleted.

34 changes: 19 additions & 15 deletions ConfigurationEditor.ServerConfiguration.UnitTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.diagnostics>
<sources>
<source name="CAS.UA.Server.ServerConfiguration" switchName="CAS.UA.Server.ServerConfiguration.Switch" switchType="System.Diagnostics.SourceSwitch">
<listeners>
<add name="LogFile" />
<remove name="Default" />
<add name="LogFile"/>
<remove name="Default"/>
</listeners>
</source>
</sources>
<switches>
<add name="CAS.UA.Server.ServerConfiguration.Switch" value="All" />
<add name="CAS.UA.Server.ServerConfiguration.Switch" value="All"/>
</switches>
<sharedListeners>
<add name="LogFile" type="CAS.Lib.CodeProtect.EnvironmentAccess.AdvancedDelimitedListTraceListener, CAS.CodeProtect" initializeData="|ApplicationDataPath|\CAS.UA.Server.ServerConfiguration.log" traceOutputOptions="DateTime">
<filter type="System.Diagnostics.EventTypeFilter" initializeData="All" />
<filter type="System.Diagnostics.EventTypeFilter" initializeData="All"/>
</add>
</sharedListeners>
<trace autoflush="true" />
<trace autoflush="true"/>
</system.diagnostics>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="CAS.CommServer.DAClientConfiguration" publicKeyToken="8832ff1a67ea61a3" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.6.25005" newVersion="5.1.6.25005" />
<assemblyIdentity name="CAS.CommServer.DAClientConfiguration" publicKeyToken="8832ff1a67ea61a3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.6.25005" newVersion="5.1.6.25005"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CAS.Windows.Forms" publicKeyToken="8832ff1a67ea61a3" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.1.2.24319" newVersion="6.1.2.24319" />
<assemblyIdentity name="CAS.Windows.Forms" publicKeyToken="8832ff1a67ea61a3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.1.2.24319" newVersion="6.1.2.24319"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CAS.CommServer.DAServerConfiguration" publicKeyToken="8832ff1a67ea61a3" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.6.25005" newVersion="5.1.6.25005" />
<assemblyIdentity name="CAS.CommServer.DAServerConfiguration" publicKeyToken="8832ff1a67ea61a3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.6.25005" newVersion="5.1.6.25005"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CAS.RealTime" publicKeyToken="8832ff1a67ea61a3" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.6.23644" newVersion="5.0.6.23644" />
<assemblyIdentity name="CAS.RealTime" publicKeyToken="8832ff1a67ea61a3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.0.6.23644" newVersion="5.0.6.23644"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CAS.CodeProtect" publicKeyToken="8832ff1a67ea61a3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.18157" newVersion="7.0.0.18157"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
10 changes: 8 additions & 2 deletions ConfigurationEditor.ServerConfiguration.UnitTests/AssemblyInitializeClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@

//___________________________________________________________________________________
//
// Copyright (C) 2020, Mariusz Postol LODZ POLAND.
//
// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI
//___________________________________________________________________________________

using CAS.CommServer.UA.Server.ServerConfiguration.UnitTests.Instrumentation;
using CAS.UA.Server.ServerConfiguration;
using Microsoft.Practices.ServiceLocation;
using CommonServiceLocator;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO;

Expand Down
7 changes: 3 additions & 4 deletions ...or.ServerConfiguration.UnitTests/ConfigurationEditor.ServerConfiguration.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CAS.CommServer.UA.Server.ServerConfiguration.UnitTests</RootNamespace>
<AssemblyName>CAS.CommServer.UA.Server.ServerConfiguration.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<FileUpgradeFlags>
Expand Down Expand Up @@ -56,9 +56,8 @@
<HintPath>..\packages\CAS.UA.IServerConfiguration.1.00.00\lib\net35\CAS.UA.IServerConfiguration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Private>True</Private>
<Reference Include="CommonServiceLocator, Version=2.0.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.5\lib\net46\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
Expand Down
12 changes: 9 additions & 3 deletions ConfigurationEditor.ServerConfiguration.UnitTests/IConfigurationUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.Practices.ServiceLocation;
//___________________________________________________________________________________
//
// Copyright (C) 2020, Mariusz Postol LODZ POLAND.
//
// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI
//___________________________________________________________________________________

using CAS.UA.IServerConfiguration;
using CommonServiceLocator;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace CAS.CommServer.UA.Server.ServerConfiguration.UnitTests
{
Expand Down
10 changes: 8 additions & 2 deletions ConfigurationEditor.ServerConfiguration.UnitTests/Instrumentation/ServiceLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@

//___________________________________________________________________________________
//
// Copyright (C) 2020, Mariusz Postol LODZ POLAND.
//
// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI
//___________________________________________________________________________________

using CAS.UA.IServerConfiguration;
using CAS.UA.Server.ServerConfiguration;
using Microsoft.Practices.ServiceLocation;
using CommonServiceLocator;
using System;
using System.Collections.Generic;
using System.Reflection;
Expand Down
2 changes: 1 addition & 1 deletion ConfigurationEditor.ServerConfiguration.UnitTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="CAS.CommServer.UA.Stack.Core" version="1.01.3265" targetFramework="net461" />
<package id="CAS.UA.IServerConfiguration" version="1.00.00" targetFramework="net461" />
<package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.5" targetFramework="net461" requireReinstallation="true" />
</packages>
Loading