Skip to content

Commit ba7244b

Browse files
author
Zack Walsh
committed
Merge branch 'main' into develop
2 parents 0da0df7 + 1e2717f commit ba7244b

14 files changed

Lines changed: 29 additions & 32 deletions

File tree

‎SharpAutoId/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[assembly: Guid("73552094-035A-4DFB-BEC4-5116EC7993EF")]
2020

2121
// Version information
22-
[assembly: AssemblyVersion("0.3.14.82")]
23-
[assembly: AssemblyFileVersion("0.3.14.82")]
22+
[assembly: AssemblyVersion("0.3.15.88")]
23+
[assembly: AssemblyFileVersion("0.3.15.88")]
2424
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
2525

‎SharpAutoId/SharpAutoId.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
</ItemGroup>
7070
<ItemGroup>
7171
<PackageReference Include="SharpLogger">
72-
<Version>1.9.1.125</Version>
72+
<Version>1.10.0.127</Version>
7373
</PackageReference>
7474
<PackageReference Include="SharpWrapper">
75-
<Version>5.3.4.375</Version>
75+
<Version>5.3.5.382</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎SharpAutoId/SharpAutoIdHelper.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ protected internal SharpAutoIdHelper(Sharp2534Session SessionInstance, ProtocolI
5151

5252
// Build our new logger object
5353
string LoggerName = $"{ProtocolValue}_AutoIdLogger_{this.Version}_{SessionInstance.DeviceName.Replace(" ", "-")}";
54-
this.AutoIdLogger = (SubServiceLogger)LogBroker.LoggerQueue.GetLoggers(LoggerActions.SubServiceLogger)
55-
.FirstOrDefault(LoggerObj => LoggerObj.LoggerName.StartsWith(LoggerName)) ?? new SubServiceLogger(LoggerName);
54+
this.AutoIdLogger = (SubServiceLogger)LoggerQueue.SpawnLogger(LoggerName, LoggerActions.SubServiceLogger);
5655

5756
// Log built new auto ID routine without issues.
5857
this.AutoIdLogger.WriteLog($"BUILT NEW AUTO ID LOGGER FOR PROTOCOL {this.AutoIdType} OK!", LogType.InfoLog);

‎SharpAutoId/SharpAutoIdHelpers/SharpAutoIdConfig.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ namespace SharpAutoId.SharpAutoIdHelpers
1616
public class SharpAutoIdConfig
1717
{
1818
// Logger object for configuration of an AutoID JSON Reader
19-
private static SubServiceLogger ConfigLogger => (SubServiceLogger)LogBroker.LoggerQueue.GetLoggers(LoggerActions.SubServiceLogger)
20-
.FirstOrDefault(LoggerObj => LoggerObj.LoggerName.StartsWith("AutoIdConfigLogger")) ?? new SubServiceLogger("AutoIdConfigLogger");
19+
private static SubServiceLogger ConfigLogger => (SubServiceLogger)LoggerQueue.SpawnLogger("AutoIdConfigLogger", LoggerActions.SubServiceLogger);
2120

2221
// ------------------------------------------------------------------------------------------------------------------------------------------
2322

‎SharpSimulator/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[assembly: Guid("183F7A6A-E107-4209-8A11-044A08DEAEE4")]
2020

2121
// Version information
22-
[assembly: AssemblyVersion("0.8.2.151")]
23-
[assembly: AssemblyFileVersion("0.8.2.151")]
22+
[assembly: AssemblyVersion("0.8.3.156")]
23+
[assembly: AssemblyFileVersion("0.8.3.156")]
2424
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
2525

‎SharpSimulator/SharpSimulator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
</ItemGroup>
7070
<ItemGroup>
7171
<PackageReference Include="SharpLogger">
72-
<Version>1.9.1.125</Version>
72+
<Version>1.10.0.127</Version>
7373
</PackageReference>
7474
<PackageReference Include="SharpWrapper">
75-
<Version>5.3.4.375</Version>
75+
<Version>5.3.5.382</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<ItemGroup>

‎SharpSimulator/SupportingLogic/SimulationConfigLoader.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ namespace SharpSimulator.SupportingLogic
1717
public static class SimulationConfigLoader
1818
{
1919
// Logger object for configuration of an AutoID JSON Reader
20-
private static SubServiceLogger ConfigLogger => (SubServiceLogger)LogBroker.LoggerQueue.GetLoggers(LoggerActions.SubServiceLogger)
21-
.FirstOrDefault(LoggerObj => LoggerObj.LoggerName.StartsWith("AutoIdConfigLogger")) ?? new SubServiceLogger("AutoIdConfigLogger");
20+
private static SubServiceLogger ConfigLogger => (SubServiceLogger)LoggerQueue.SpawnLogger("AutoIdConfigLogger", LoggerActions.SubServiceLogger);
2221

2322
// ------------------------------------------------------------------------------------------------------------------------------------------
2423

‎SharpWrapper/PassThruTypes/PassThruEnums.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public enum BaudRate : uint
6262
CAN_250000 = 250000,
6363
CAN_500000 = 500000,
6464

65+
ISO15765_33333 = 33333,
6566
ISO15765_125000 = 125000,
6667
ISO15765_250000 = 250000,
6768
ISO15765_500000 = 500000

‎SharpWrapper/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[assembly: InternalsVisibleTo("SharpWrap2534Tests")]
2121

2222
// Version information
23-
[assembly: AssemblyVersion("5.3.4.378")]
24-
[assembly: AssemblyFileVersion("5.3.4.378")]
23+
[assembly: AssemblyVersion("5.3.5.382")]
24+
[assembly: AssemblyFileVersion("5.3.5.382")]
2525
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
2626

‎SharpWrapper/SharpWrapper.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>..\packages\SharpLogger.1.9.1.125\lib\net472\Newtonsoft.Json.dll</HintPath>
43+
<HintPath>..\packages\SharpLogger.1.10.0.127\lib\net472\Newtonsoft.Json.dll</HintPath>
4444
</Reference>
4545
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
46-
<HintPath>..\packages\SharpLogger.1.9.1.125\lib\net472\NLog.dll</HintPath>
46+
<HintPath>..\packages\SharpLogger.1.10.0.127\lib\net472\NLog.dll</HintPath>
4747
</Reference>
48-
<Reference Include="SharpLogger, Version=1.9.1.125, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\SharpLogger.1.9.1.125\lib\net472\SharpLogger.dll</HintPath>
48+
<Reference Include="SharpLogger, Version=1.10.0.127, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\SharpLogger.1.10.0.127\lib\net472\SharpLogger.dll</HintPath>
5050
</Reference>
5151
<Reference Include="System" />
5252
<Reference Include="System.Configuration" />
@@ -95,16 +95,15 @@
9595
<ItemGroup>
9696
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
9797
</ItemGroup>
98-
<ItemGroup>
99-
<None Include="packages.config" />
100-
</ItemGroup>
10198
<ItemGroup>
10299
<Content Include="Properties\AssemblyInfo.tt">
103100
<Generator>TextTemplatingFileGenerator</Generator>
104101
<LastGenOutput>AssemblyInfo.cs</LastGenOutput>
105102
</Content>
106103
</ItemGroup>
107-
<ItemGroup />
104+
<ItemGroup>
105+
<None Include="packages.config" />
106+
</ItemGroup>
108107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109108
<PropertyGroup>
110109
<PreBuildEvent>"$(DevEnvDir)\TextTransform.exe" -a !!build!true "$(ProjectDir)Properties\AssemblyInfo.tt"</PreBuildEvent>

0 commit comments

Comments
 (0)