Bump xunit packages (#336)

PublicApiGenerator · Dec 2, 2023 · 39e2328 · 39e2328
1 parent fe330a4
commit 39e2328
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/cd-preview.yml b/.github/workflows/cd-preview.yml
@@ -39,7 +39,7 @@ jobs:
         working-directory: src
         run: |
           dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f netcoreapp3.1 &&
-          dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f net6
+          dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f net6.0
       - name: Pack solution [Release]
         working-directory: src
         run: dotnet pack --no-restore --no-build -c Release -o out

diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
@@ -36,7 +36,7 @@ jobs:
         working-directory: src
         run: |
           dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f netcoreapp3.1 &&
-          dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f net6
+          dotnet publish PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj --no-restore --no-build -c Release -f net6.0
       - name: Pack solution [Release]
         working-directory: src
         run: dotnet pack --no-restore --no-build -c Release -o out

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,6 +35,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.201
+            8.0.100
       - name: Install dependencies
         working-directory: src
         run: dotnet restore

diff --git a/src/PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj b/src/PublicApiGenerator.Tool/PublicApiGenerator.Tool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>generate-public-api</ToolCommandName>
     <Description>This tool generates your public API to a file. You can use this in approval style tests or for documentation.</Description>

diff --git a/src/PublicApiGeneratorTests/Assembly_attributes.cs b/src/PublicApiGeneratorTests/Assembly_attributes.cs
@@ -27,12 +27,16 @@ public void Attributes()
             const string TFM = ".NETCoreApp,Version=v3.1";
             const string TFMNAME = ".NET Core 3.1";
 #endif
+            string suffix = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") == "true" // TODO: WHY?
+                ? ""
+                : ".git";
+
             var api = @$"[assembly: PublicApiGeneratorTests.Examples.AttributeWithMultiplePositionalParameters(42, ""Hello"")]
 [assembly: PublicApiGeneratorTests.Examples.AttributeWithNamedParameter(IntValue=42, StringValue=""Hello"")]
 [assembly: PublicApiGeneratorTests.Examples.AttributeWithPositionalParameters1(""Hello"")]
 [assembly: PublicApiGeneratorTests.Examples.AttributeWithPositionalParameters2(42)]
 [assembly: PublicApiGeneratorTests.Examples.Simple]
-[assembly: System.Reflection.AssemblyMetadata(""RepositoryUrl"", """")]
+[assembly: System.Reflection.AssemblyMetadata(""RepositoryUrl"", ""https://github.com/PublicApiGenerator/PublicApiGenerator{suffix}"")]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: System.Runtime.InteropServices.Guid(""3B8D506A-5247-47FF-B053-D29A51A97C33"")]
 [assembly: System.Runtime.Versioning.TargetFramework(""{TFM}"", FrameworkDisplayName=""{TFMNAME}"")]

diff --git a/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj b/src/PublicApiGeneratorTests/PublicApiGeneratorTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618;CS0067;CS8597;CS8603;CS8618;CS8653;IDE0051;IDE0060;IDE1006</NoWarn>
     <!--
     CS0618 Class obsolete
@@ -25,8 +25,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" NoWarn="NU1701">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>