Skip to content

Commit f6911e4

Browse files
committed
Merge pull request #15 from Axemasta/chore/remove-fluent-assertions
Remove FluentAssertions Dependency
2 parents 2b9b33c + e66aaf6 commit f6911e4

5 files changed

Lines changed: 17 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ jobs:
5959
uses: actions/upload-artifact@v4
6060
with:
6161
name: drop
62-
path: src/**/*.nupkg
62+
path: |
63+
src/**/*.nupkg
64+
src/**/*.snupkg
6365
6466
release:
6567
needs: build
@@ -69,6 +71,8 @@ jobs:
6971
IS_PRERELEASE: true
7072
RELEASE_TITLE: v0.0.1
7173
VERSION_NAME: 0.0.1
74+
ARTIFACT_NAME: 'drop'
75+
ARTIFACTS: 'Artifacts/**/*.nupkg'
7276
steps:
7377
- uses: actions/checkout@v3
7478

@@ -131,7 +135,7 @@ jobs:
131135
- uses: ncipollo/release-action@main
132136
name: Create Release
133137
with:
134-
artifacts: Artifacts/**/*.nupkg
138+
artifacts: 'Artifacts/**/*.nupkg,Artifacts/**/*.snupkg'
135139
artifactErrorsFailBuild: true
136140
draft: true
137141
generateReleaseNotes: true
@@ -140,7 +144,8 @@ jobs:
140144
prerelease: ${{ env.IS_PRERELEASE }}
141145
body: "TODO"
142146

147+
# Nuget will automatically pick up the symbol packages if they are in the same location as the main package
143148
- name: Publish NuGet
144-
run: dotnet nuget push Artifacts/**/*.nupkg --source 'https://api.nuget.org/v3/index.json' --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
149+
run: dotnet nuget push ${{ env.ARTIFACTS }} --source 'https://api.nuget.org/v3/index.json' --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
145150

146151

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.203"
3+
"version": "8.0.414"
44
}
55
}

src/Moq.INavigationService/EquivalenceHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using FluentAssertions;
1+
using Xunit;
2+
23
namespace Moq;
34

45
internal class EquivalenceHelper
@@ -7,8 +8,7 @@ public static bool AreEquivalent(object? a, object? b)
78
{
89
try
910
{
10-
a.Should().BeEquivalentTo(b);
11-
11+
Assert.Equivalent(a, b);
1212
return true;
1313
}
1414
catch

src/Moq.INavigationService/Moq.INavigationService.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<IsTestProject>false</IsTestProject>
89
</PropertyGroup>
910

1011
<PropertyGroup Label="NuGet">
@@ -24,6 +25,8 @@
2425
<PackageProjectUrl>https://github.com/Axemasta/Moq.INavigationService</PackageProjectUrl>
2526
<PackageReadmeFile>README.md</PackageReadmeFile>
2627
<GenerateDocumentationFile>true</GenerateDocumentationFile>
28+
<IncludeSymbols>True</IncludeSymbols>
29+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2730
</PropertyGroup>
2831

2932
<ItemGroup>
@@ -41,7 +44,7 @@
4144
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4245
<PrivateAssets>all</PrivateAssets>
4346
</PackageReference>
44-
<PackageReference Include="FluentAssertions" Version="7.0.0" />
47+
<PackageReference Include="xunit" Version="2.9.3" PrivateAssets="All"/>
4548
</ItemGroup>
4649

4750
</Project>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.1",
3+
"version": "1.2",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)