Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
thompson-tomo committed Oct 27, 2024
1 parent 2e09a24 commit 9da5647
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="NJsonSchema" Version="11.0.0" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="NSubstitute" Version="5.0.0" />
<PackageVersion Include="AsyncAPI.NET.Bindings" Version="5.2.1" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
<PackageVersion Include="Namotion.Reflection" Version="3.1.1" />
<PackageVersion Include="NSubstitute" Version="5.0.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand Down
6 changes: 3 additions & 3 deletions src/Saunter/Saunter.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Saunter</PackageId>
Expand All @@ -22,8 +22,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NJsonSchema" />
<PackageReference Include="NJsonSchema.NewtonsoftJson" />
<PackageReference Include="AsyncAPI.NET.Bindings" />
<PackageReference Include="Namotion.Reflection" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 7 additions & 6 deletions test/Saunter.Tests/Saunter.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DocumentationFile>bin\Debug\Saunter.Tests.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>bin\Debug\Saunter.Tests.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DocumentationFile>bin\Release\Saunter.Tests.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>bin\Release\Saunter.Tests.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Shouldly" />
Expand Down

0 comments on commit 9da5647

Please sign in to comment.