Skip to content

Commit

Permalink
Code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@PatrickRitchie
PatrickRitchie committed Jun 1, 2023
1 parent ffa3403 commit b6ad9d2
Show file tree
Hide file tree
Showing 17 changed files with 169 additions and 12 deletions.
12 changes: 12 additions & 0 deletions applications/Agents/MTConnect-Agent-MQTT-Broker-Gateway/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect-Agent-MQTT-Broker-Gateway": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59481;http://localhost:59482"
}
}
}
12 changes: 12 additions & 0 deletions applications/Agents/MTConnect-Agent-MQTT-Broker/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect-Agent-MQTT-Broker": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59473;http://localhost:59474"
}
}
}
12 changes: 12 additions & 0 deletions applications/Agents/MTConnect-Agent-MQTT-Relay-Gateway/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect-Agent-MQTT-Relay-Gateway": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59483;http://localhost:59484"
}
}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-Applications-Agents-MQTT/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-Applications-Agents-MQTT": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59471;http://localhost:59472"
}
}
}
3 changes: 1 addition & 2 deletions src/MTConnect.NET-Applications-Agents/IMTConnectAgentApplication.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ public interface IMTConnectAgentApplication

string ServiceDescription { get; }


IMTConnectAgentBroker Agent { get; }

EventHandler<AgentConfiguration> OnRestart { get; set; }
event EventHandler<AgentConfiguration> OnRestart;



Expand Down
3 changes: 2 additions & 1 deletion src/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public abstract class MTConnectAgentApplication : IMTConnectAgentApplication

public IMTConnectAgentBroker Agent => _mtconnectAgent;

public EventHandler<AgentConfiguration> OnRestart { get; set; }
public event EventHandler<AgentConfiguration> OnRestart;


public MTConnectAgentApplication()
Expand Down Expand Up @@ -720,5 +720,6 @@ private void InvalidAsset(IAsset asset, AssetValidationResult result)
}

#endregion

}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-Applications-Agents/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-Applications-Agents": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59467;http://localhost:59468"
}
}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-DeviceFinder/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-DeviceFinder": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59469;http://localhost:59470"
}
}
}
9 changes: 9 additions & 0 deletions src/MTConnect.NET-HTTP/Clients/MTConnectHttpClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,19 @@ private void Init()

#region "Events"

/// <summary>
/// Raised when a Device is received
/// </summary>
public event EventHandler<IDevice> DeviceReceived;

/// <summary>
/// Raised when an Observation is received
/// </summary>
public event EventHandler<IObservation> ObservationReceived;

/// <summary>
/// Raised when an Asset is received
/// </summary>
public event EventHandler<IAsset> AssetReceived;

/// <summary>
Expand Down
12 changes: 12 additions & 0 deletions src/MTConnect.NET-JSON/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-JSON": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59458;http://localhost:59459"
}
}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-Models/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-Models": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59463;http://localhost:59464"
}
}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-TLS/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-TLS": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59479;http://localhost:59480"
}
}
}
12 changes: 12 additions & 0 deletions src/MTConnect.NET-XML/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-XML": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59460;http://localhost:59461"
}
}
}
10 changes: 1 addition & 9 deletions src/MTConnect.NET.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-Applications-
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{0957974A-CA4D-45DD-A0CB-2C4A9CD03350}"
ProjectSection(SolutionItems) = preProject
..\docs\InfluxDB.md = ..\docs\InfluxDB.md
..\docs\MQTT-AWS-Greengrass-Moquette.md = ..\docs\MQTT-AWS-Greengrass-Moquette.md
..\docs\MQTT-AWS-Greengrass-Mqtt-Bridge.md = ..\docs\MQTT-AWS-Greengrass-Mqtt-Bridge.md
..\docs\MQTT-AWS-IoT.md = ..\docs\MQTT-AWS-IoT.md
Expand All @@ -102,8 +103,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect-Agent-MQTT-Relay-
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-TLS", "MTConnect.NET-TLS\MTConnect.NET-TLS.csproj", "{82B8CF89-A378-47FF-B0DE-EE5F020D9586}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTConnect-Agent", "..\applications\Agents\MTConnect-Agent\MTConnect-Agent.csproj", "{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -315,12 +314,6 @@ Global
{82B8CF89-A378-47FF-B0DE-EE5F020D9586}.Package|Any CPU.Build.0 = Debug|Any CPU
{82B8CF89-A378-47FF-B0DE-EE5F020D9586}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82B8CF89-A378-47FF-B0DE-EE5F020D9586}.Release|Any CPU.Build.0 = Release|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Package|Any CPU.ActiveCfg = Debug|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Package|Any CPU.Build.0 = Debug|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -359,7 +352,6 @@ Global
{44BAF649-0F9F-446A-B1A4-6F2DCF91C968} = {6C3F47E0-BC95-48CB-93A4-C34A0D5CA43B}
{61CB960E-761A-4F89-A365-E9394AD3FA30} = {6C3F47E0-BC95-48CB-93A4-C34A0D5CA43B}
{82B8CF89-A378-47FF-B0DE-EE5F020D9586} = {E0233BEB-F66C-43C4-9DC8-20182894CF5F}
{45DD20AA-AB6E-4F48-95F1-56424ABAB69F} = {6C3F47E0-BC95-48CB-93A4-C34A0D5CA43B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC13D3AD-18BF-4695-AB2A-087EF0885B20}
Expand Down
12 changes: 12 additions & 0 deletions tests/IntegrationTests/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"IntegrationTests": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59465;http://localhost:59466"
}
}
}
12 changes: 12 additions & 0 deletions tests/MTConnect.NET-HTTP-Tests/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-HTTP-Tests": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59477;http://localhost:59478"
}
}
}
12 changes: 12 additions & 0 deletions tests/MTConnect.NET-Tests-Agents/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"profiles": {
"MTConnect.NET-Tests-Agents": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:59475;http://localhost:59476"
}
}
}

0 comments on commit b6ad9d2

Please sign in to comment.