Skip to content

Commit

Permalink
Merge pull request #371 from dotnet/feature/versionbumps
Browse files Browse the repository at this point in the history
Bumping dependencies
  • Loading branch information
SteveSyfuhs authored Jun 24, 2024
2 parents 3fd93b8 + f6159c0 commit 6828266
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Bruce/Bruce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DnsClient" Version="1.4.0" />
<PackageReference Include="Humanizer.Core" Version="2.10.1" />
<PackageReference Include="DnsClient" Version="1.7.0" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 10 additions & 1 deletion Bruce/CommandLine/CommandLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@ internal static IEnumerable<Type> LoadTypes()

foreach (var assembly in assemblies)
{
var types = assembly.GetTypes().Where(t => t.GetCustomAttribute<CommandLineCommandAttribute>() != null);
IEnumerable<Type> types = Array.Empty<Type>();

try
{
types = assembly.GetTypes().Where(t => t.GetCustomAttribute<CommandLineCommandAttribute>() != null);
}
catch (ReflectionTypeLoadException rex)
{
Debug.WriteLine(rex);
}

foreach (var type in types)
{
Expand Down
2 changes: 1 addition & 1 deletion Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.203" PrivateAssets="all" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions Kerberos.NET/Kerberos.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Samples/KerbDumpCore/KerbDumpCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@

<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
<StartupObject>Benchmark.Kerberos.NET.Program</StartupObject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 5 additions & 3 deletions Tests/Benchmark.Kerberos.NET/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,13 @@ public static CommandLineParameters Parse(string[] args)
}
}

class Program
public class Program
{
private static readonly EventWaitHandle WaitForAllProcessesToStart = new EventWaitHandle(false, EventResetMode.ManualReset, "KerbBenchmarkRunnerWaitForAllProcesses");

static async Task Main(string[] args)
static void Main(string[] args) => MainAsync(args).Wait();

static async Task MainAsync(string[] args)
{
var cmd = CommandLineParameters.Parse(args);

Expand Down Expand Up @@ -216,7 +218,7 @@ static async Task Main(string[] args)
}
}

public static IEnumerable<List<T>> SplitList<T>(List<T> locations, int size)
private static IEnumerable<List<T>> SplitList<T>(List<T> locations, int size)
{
for (int i = 0; i < locations.Count; i += size)
{
Expand Down
12 changes: 6 additions & 6 deletions Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeCoverage" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.1" />
<PackageReference Include="Microsoft.CodeCoverage" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -144,7 +144,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="coverlet.collector" Version="3.0.3">
<PackageReference Update="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 6828266

Please sign in to comment.