Skip to content

Commit

Permalink
Update submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
halgari authored Nov 14, 2024
1 parent 45f278f commit f1b3e2a
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 26 deletions.
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ indent_size = 4
tab_width = 4

# Verify settings
[*.{received,verified}.{txt,xml,json,cs}]
[*.{received,verified}.{txt,xml,json}]
charset = "utf-8-bom"
end_of_line = lf
indent_size =
indent_style =
insert_final_newline = false
tab_width =
trim_trailing_whitespace = false

4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,3 @@ FodyWeavers.xsd

# JetBrains Rider
*.sln.iml

# Verify
*.received.*
*.received/
6 changes: 5 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -19,4 +19,8 @@
<!-- SYSLIB1006: Multiple logging methods cannot use the same event ID -->
<NoWarn>$(NoWarn);SYSLIB1006</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.*" PrivateAssets="all" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<LangVersion>12</LangVersion>
<LangVersion>11</LangVersion>
<ImplicitUsings>false</ImplicitUsings>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>
6 changes: 4 additions & 2 deletions NuGet.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

<!-- This is the URL to the main project, not the individual package. -->
<PackageProjectUrl>https://github.com/Nexus-Mods/NexusMods.App</PackageProjectUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -33,4 +31,8 @@
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="assets" />
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="docs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="all" />
</ItemGroup>
</Project>
Binary file modified icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 36 additions & 15 deletions tests/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,30 +1,51 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('CVE.Ignore.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Moq" Version="4.*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.*" />
<PackageReference Include="AutoFixture.AutoMoq" Version="4.*" />
<PackageReference Include="AutoFixture.Xunit2" Version="4.*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="FluentAssertions.OneOf" />
<PackageReference Include="FluentAssertions.Analyzers"/>
<PackageReference Include="FluentAssertions" Version="6.*" />
<PackageReference Include="FluentAssertions.OneOf" Version="0.0.5" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.18.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="xunit"/>
<PackageReference Include="xunit.runner.visualstudio"/>
<PackageReference Include="Xunit.SkippableFact"/>
<PackageReference Include="Xunit.DependencyInjection"/>
<PackageReference Include="Xunit.DependencyInjection.Logging"/>
<PackageReference Include="Xunit.DependencyInjection.SkippableFact"/>
<PackageReference Include="xunit" Version="2.4.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.*" />
<PackageReference Include="Xunit.DependencyInjection" Version="8.*" />
<PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.*" />
<PackageReference Include="Xunit.DependencyInjection.SkippableFact" Version="8.*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="coverlet.collector"/>
<PackageReference Include="GitHubActionsTestLogger"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.*" />
<PackageReference Include="coverlet.collector" Version="6.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="GitHubActionsTestLogger" Version="2.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions tests/SharedUsings.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ReSharper disable RedundantUsingDirective.Global
global using Xunit;
global using FluentAssertions;
global using AutoFixture;
global using AutoFixture.Xunit2;

0 comments on commit f1b3e2a

Please sign in to comment.