Resolve issue with Verify version upgrade

Afterlife-Guide · Jan 30, 2024 · 2a44fab · 2a44fab
1 parent 07feee8
commit 2a44fab
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/test-dependabot.yml b/.github/workflows/test-dependabot.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   get-version:
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: ${{ github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch' }}
     uses: ./.github/workflows/step-version.yml
 
   build:

diff --git a/.gitignore b/.gitignore
@@ -92,6 +92,9 @@ fabric.properties
 # End of https://www.toptal.com/developers/gitignore/api/rider,dotnetcore
 
 ## CUSTOM
+# intellij
+*.DotSettings.user
+
 ## VERIFY
 *.received.txt
 *.received.json
diff --git a/.idea/.idea.AppSettings.Merge/.idea/indexLayout.xml b/.idea/.idea.AppSettings.Merge/.idea/indexLayout.xml
diff --git a/AppSettings.Merge.sln b/AppSettings.Merge.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build.cake = build.cake
 		CHANGELOG.md = CHANGELOG.md
 		semver.json = semver.json
+		.cm\gitstream.cm = .cm\gitstream.cm
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorMerge", "src\BlazorMerge\BlazorMerge.csproj", "{547043C0-1917-4C37-9624-97217B9B3D69}"

diff --git a/AppSettings.Merge.sln.DotSettings.user b/AppSettings.Merge.sln.DotSettings.user
diff --git a/test/BlazorMerge.UnitTests/BlazorMerge.UnitTests.csproj b/test/BlazorMerge.UnitTests/BlazorMerge.UnitTests.csproj
@@ -13,6 +13,11 @@
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="NSubstitute" Version="5.1.0" />
       <PackageReference Include="Verify.Xunit" Version="23.0.1" />
+      <PackageReference Include="xunit" Version="2.6.6" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/BlazorMerge.UnitTests/Merge/MergerTests.cs b/test/BlazorMerge.UnitTests/Merge/MergerTests.cs
@@ -3,12 +3,11 @@
 
 namespace BlazorMerge.UnitTests.Merge;
 
-[UsesVerify]
 public class MergerTests
 {
 
     [ModuleInitializer]
-    public static void Init() => VerifierSettings.UseStrictJson();
+    internal static void Init() => VerifierSettings.UseStrictJson();
 
     [Fact]
     public Task When_MergingJsonObjects_Then_ResultShouldBeTheCombinationOfBoth()