Enable UseArtifactsOutput for src projects only + minor corrections

adams85 · Nov 19, 2024 · 446df58 · 446df58
1 parent 42c9211
commit 446df58
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -33,6 +33,7 @@ jobs:
         with:
           dotnet-version: |
             6.0
+            8.0
       - uses: actions/checkout@v4
       - name: 'Run: Compile, Test, Pack'
         run: ./build.cmd Compile Test Pack
@@ -44,6 +45,7 @@ jobs:
         with:
           dotnet-version: |
             6.0
+            8.0
       - uses: actions/checkout@v4
       - name: 'Run: Compile, Test, Pack'
         run: ./build.cmd Compile Test Pack
@@ -55,6 +57,7 @@ jobs:
         with:
           dotnet-version: |
             6.0
+            8.0
       - uses: actions/checkout@v4
       - name: 'Run: Compile, Test, Pack'
         run: ./build.cmd Compile Test Pack
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,6 @@
     <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>true</WarningsAsErrors>
-    <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
 
   <PropertyGroup Label="Code Analysis">

diff --git a/benchmarks/Acornima.Benchmarks/run.cmd b/benchmarks/Acornima.Benchmarks/run.cmd
@@ -2,11 +2,11 @@
 
 SETLOCAL
 
-IF NOT [%2] == [] (
-  SET RUNTIMES=%2
+IF NOT [%1] == [] (
+  SET RUNTIMES=%1
 )
 
-IF [%2] == [] (
+IF [%1] == [] (
   SET RUNTIMES=net8.0 net48
 )
 

diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs
@@ -42,7 +42,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
         var job = base.GetJobs(image, relevantTargets);
         var newSteps = new List<GitHubActionsStep>(job.Steps);
         // only need to list the ones that are missing from default image
-        newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["6.0"]));
+        newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["6.0", "8.0"]));
         job.Steps = newSteps.ToArray();
         return job;
     }

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -12,7 +12,6 @@
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-    <UseArtifactsOutput>false</UseArtifactsOutput>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,6 +7,9 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Karambolo.Public.snk</AssemblyOriginatorKeyFile>
 
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <ArtifactsPath>$(MSBuildThisFileDirectory)..\artifacts</ArtifactsPath>
+
     <Authors>Adam Simon</Authors>
     <Copyright>Adam Simon</Copyright>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
@@ -19,6 +22,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
     <NoWarn>1591;$(NoWarn)</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/test/Acornima.Tests.SourceGenerators/SourceGeneratorTest.cs b/test/Acornima.Tests.SourceGenerators/SourceGeneratorTest.cs
@@ -9,6 +9,6 @@ public class SourceGeneratorTest
 
     protected static string ToSourcePath(string path, string project = MainProject)
     {
-        return Path.Combine($"../../../../src/{project}/", path);
+        return Path.Combine("..", "..", "..", "..", "..", "src", project, path);
     }
 }
diff --git a/test/Acornima.Tests/ParserTests.Fixtures.cs b/test/Acornima.Tests/ParserTests.Fixtures.cs
@@ -34,8 +34,8 @@ internal static string GetFixturesPath()
         var assemblyPath = typeof(RegExpTests).GetTypeInfo().Assembly.Location;
 #endif
         var assemblyDirectory = new FileInfo(assemblyPath).Directory;
-        var root = Path.Combine(assemblyDirectory?.Parent?.Parent?.Parent?.Parent?.FullName ?? "", "test", "Acornima.Tests");
-        return root;
+        var root = assemblyDirectory?.Parent?.Parent?.Parent?.FullName;
+        return root ?? "";
     }
 
     public static IEnumerable<object[]> Fixtures(string relativePath)