Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into scoreboard-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
araszka committed Sep 30, 2024
2 parents 875b6e4 + 48b1567 commit 7f8d426
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ EvoSC/ext_plugins/*
docker-compose.yml
global.json
.env
nuget.config
1 change: 1 addition & 0 deletions src/Modules/MapsModule/MapsModule.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hawf" Version="2.0.0" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions tests/Modules/FastestCp.Tests/FastestCp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
</ItemGroup>

<ItemGroup>
<ContentWithTargetPath Include="**\*.xml">
<ContentWithTargetPath Include="Manialinks\*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>%(RecursiveDir)\%(Filename)%(Extension)</TargetPath>
<TargetPath>Manialinks\%(Filename)%(Extension)</TargetPath>
</ContentWithTargetPath>
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
<PackageReference Include="xunit" Version="2.4.2"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down

0 comments on commit 7f8d426

Please sign in to comment.