Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelstonis committed Oct 30, 2024
2 parents b9c7dad + b2fc6a4 commit d556026
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Version="8.0.0"
PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers"
Version="4.7.0"
Version="4.12.9"
PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
Expand All @@ -38,4 +38,4 @@
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json"
Link="stylecop.json" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions TychoDB.Benchmarks/TychoDB.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<Folder Include="Benchmarks\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../TychoDB.JsonSerializer.NewtonsoftJson/TychoDB.JsonSerializer.NewtonsoftJson.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageId>TychoDB.JsonSerializer.SystemTextJson</PackageId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../TychoDB.JsonSerializer/TychoDB.JsonSerializer.csproj" />
Expand Down
13 changes: 5 additions & 8 deletions TychoDB.UnitTests/TychoDB.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,26 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType />
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Encrypted|AnyCPU' ">
<IntermediateOutputPath>obj\Release\net5.0</IntermediateOutputPath>
<DebugType />
<Optimize>true</Optimize>
<OutputPath>bin\Encrypted\net5.0</OutputPath>
<DefineConstants>TRACE;RELEASE;NET;NET5_0;NETCOREAPP;ENCRYPTED;</DefineConstants>
<WarningLevel>4</WarningLevel>
<DocumentationFile />
<NoWarn>1701;1702</NoWarn>
<NoStdLib>true</NoStdLib>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions TychoDB/TychoDB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.4" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' != 'Encrypted' ">
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.7" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../TychoDB.JsonSerializer/TychoDB.JsonSerializer.csproj" />
Expand Down

0 comments on commit d556026

Please sign in to comment.