Skip to content

Commit 42e1eb7

Browse files
Yannis-S-StandaertYannis-S-Standaert
committed
version bumps and consolidations, nuspec file fixes
1 parent 045240b commit 42e1eb7

File tree

25 files changed

+8917
-1462
lines changed

25 files changed

+8917
-1462
lines changed

‎Aikido.Zen.Benchmarks/Aikido.Zen.Benchmarks.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
1215
<PackageReference Include="System.Net.Http" Version="4.3.4" />
16+
<PackageReference Include="System.Text.Json" Version="9.0.2" />
1317
</ItemGroup>
1418

1519
<ItemGroup>

‎Aikido.Zen.Core/Aikido.Zen.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
4040
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
4141
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
42-
<PackageReference Include="System.Text.Json" Version="9.0.1" />
42+
<PackageReference Include="System.Text.Json" Version="9.0.2" />
4343
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
4444
</ItemGroup>
4545
</Project>

‎Aikido.Zen.DotNetCore/Aikido.Zen.DotNetCore.csproj‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Lib.Harmony" Version="2.3.5" />
15-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.3.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
1818
<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
23-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
25-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
26-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
27-
<PackageReference Include="System.Text.Json" Version="9.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
20+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2" />
21+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
22+
<PackageReference Include="System.Text.Json" Version="9.0.2" />
2823
</ItemGroup>
2924

3025
<ItemGroup>

‎Aikido.Zen.DotNetCore/Aikido.Zen.DotNetCore.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<dependency id="Microsoft.Extensions.DependencyInjection" version="9.0.2" />
2929
<dependency id="Microsoft.Extensions.Options" version="9.0.0" />
3030
<dependency id="System.Text.Json" version="9.0.1" />
31-
<dependen
31+
<dependency id="Microsoft.Extensions.Logging" version="9.0.2" />
32+
</group>
3233
<group targetFramework="net8.0">
3334
<dependency id="Lib.Harmony" version="2.3.5" />
3435
<dependency id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" />

‎Aikido.Zen.DotNetFramework/Aikido.Zen.DotNetFramework.csproj‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@
7070
<Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7171
<HintPath>..\sample-apps\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
7272
</Reference>
73-
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
73+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
7575
</Reference>
7676
<Reference Include="Microsoft.Data.SqlClient, Version=5.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
7777
<HintPath>..\packages\Microsoft.Data.SqlClient.5.2.2\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.Data.Sqlite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
8080
<HintPath>..\packages\Microsoft.Data.Sqlite.Core.9.0.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
82+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
8484
</Reference>
8585
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
8686
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
@@ -155,8 +155,8 @@
155155
<Reference Include="System.Data.SQLite.Linq, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
156156
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
157157
</Reference>
158-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
159-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
158+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
159+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
160160
</Reference>
161161
<Reference Include="System.Drawing" />
162162
<Reference Include="System.IdentityModel" />
@@ -166,8 +166,8 @@
166166
<Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
167167
<HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
168168
</Reference>
169-
<Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
170-
<HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
169+
<Reference Include="System.IO.Pipelines, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
170+
<HintPath>..\packages\System.IO.Pipelines.9.0.2\lib\net462\System.IO.Pipelines.dll</HintPath>
171171
</Reference>
172172
<Reference Include="System.Management" />
173173
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -198,11 +198,11 @@
198198
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
199199
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
200200
</Reference>
201-
<Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
202-
<HintPath>..\sample-apps\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
201+
<Reference Include="System.Text.Encodings.Web, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
202+
<HintPath>..\packages\System.Text.Encodings.Web.9.0.2\lib\net462\System.Text.Encodings.Web.dll</HintPath>
203203
</Reference>
204-
<Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
205-
<HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
204+
<Reference Include="System.Text.Json, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
205+
<HintPath>..\packages\System.Text.Json.9.0.2\lib\net462\System.Text.Json.dll</HintPath>
206206
</Reference>
207207
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
208208
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -245,7 +245,6 @@
245245
<None Include="app.config" />
246246
<None Include="packages.config" />
247247
</ItemGroup>
248-
<ItemGroup />
249248
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
250249
<Import Project="..\packages\Microsoft.Data.SqlClient.SNI.5.2.0\build\net462\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.5.2.0\build\net462\Microsoft.Data.SqlClient.SNI.targets')" />
251250
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎Aikido.Zen.DotNetFramework/Aikido.Zen.DotNetFramework.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency id="Microsoft.AspNetCore.WebUtilities" version="[2.2.0,99.99.99)" />
1818
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="[9.0.2,99.99.99)" />
1919
<dependency id="Microsoft.Extensions.Logging" version="[9.0.2,99.99.99)" />
20-
<dependency id="System.Text.Json" version="[9.0.0,99.99.99)" />
20+
<dependency id="System.Text.Json" version="[9.0.2,99.99.99)" />
2121
</dependencies>
2222
</metadata>
2323
<files>

‎Aikido.Zen.DotNetFramework/app.config‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
23+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
2424
</dependentAssembly>
2525
<dependentAssembly>
2626
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
27+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
35-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
35+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
3636
</dependentAssembly>
3737
<dependentAssembly>
3838
<assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -46,6 +46,10 @@
4646
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
4747
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
4848
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
52+
</dependentAssembly>
4953
</assemblyBinding>
5054
</runtime>
5155
<entityFramework>
@@ -60,4 +64,4 @@
6064
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
6165
<remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
6266
</system.data>
63-
</configuration>
67+
</configuration>

‎Aikido.Zen.DotNetFramework/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<package id="Lib.Harmony" version="2.3.5" targetFramework="net48" />
1212
<package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net48" />
1313
<package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net48" />
14-
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net48" />
14+
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.2" targetFramework="net48" />
1515
<package id="Microsoft.Data.SqlClient" version="5.2.2" targetFramework="net48" />
1616
<package id="Microsoft.Data.SqlClient.SNI" version="5.2.0" targetFramework="net48" />
1717
<package id="Microsoft.Data.Sqlite" version="9.0.0" targetFramework="net48" />
1818
<package id="Microsoft.Data.Sqlite.Core" version="9.0.0" targetFramework="net48" />
19-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net48" />
19+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.2" targetFramework="net48" />
2020
<package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.2" targetFramework="net48" />
2121
<package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net48" />
2222
<package id="Microsoft.Identity.Client" version="4.61.3" targetFramework="net48" />
@@ -43,10 +43,10 @@
4343
<package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
4444
<package id="System.Data.SQLite.EF6" version="1.0.119.0" targetFramework="net48" />
4545
<package id="System.Data.SQLite.Linq" version="1.0.119.0" targetFramework="net48" />
46-
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net48" />
46+
<package id="System.Diagnostics.DiagnosticSource" version="9.0.2" targetFramework="net48" />
4747
<package id="System.IdentityModel.Tokens.Jwt" version="6.35.0" targetFramework="net48" />
4848
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net48" />
49-
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net48" />
49+
<package id="System.IO.Pipelines" version="9.0.2" targetFramework="net48" />
5050
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
5151
<package id="System.Memory.Data" version="1.0.2" targetFramework="net48" />
5252
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
@@ -58,9 +58,9 @@
5858
<package id="System.Security.Cryptography.ProtectedData" version="4.7.0" targetFramework="net48" />
5959
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
6060
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net48" />
61-
<package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net48" />
62-
<package id="System.Text.Json" version="9.0.0" targetFramework="net48" />
61+
<package id="System.Text.Encodings.Web" version="9.0.2" targetFramework="net48" />
62+
<package id="System.Text.Json" version="9.0.2" targetFramework="net48" />
6363
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
6464
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
6565
<package id="ZstdSharp.Port" version="0.8.0" targetFramework="net48" />
66-
</packages>
66+
</packages>

‎Aikido.Zen.Test.End2End/Aikido.Zen.Test.End2End.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,20 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
18+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.2" />
19+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
1420
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1521
<PackageReference Include="NUnit" Version="4.0.1" />
1622
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
1723
<PackageReference Include="NUnit.Analyzers" Version="4.0.1" />
1824
<PackageReference Include="coverlet.collector" Version="6.0.0" />
1925
<PackageReference Include="Polly" Version="8.2.1" />
26+
<PackageReference Include="System.Text.Json" Version="9.0.2" />
2027
<PackageReference Include="TestContainers" Version="4.1.0" />
2128
</ItemGroup>
2229

0 commit comments

Comments
 (0)