From b43f5de17a9a0d3c96db24fe57e536d07de36cf7 Mon Sep 17 00:00:00 2001
From: sangar-1028 <sangar.work1028@gmail.com>
Date: Fri, 18 Oct 2024 15:18:49 -0700
Subject: [PATCH] Adjust build output (#307)

---
 .github/workflows/CI.yml       | 18 +++++-------------
 .github/workflows/Official.yml |  2 +-
 Directory.Build.props          |  2 ++
 Directory.Build.rsp            |  1 +
 Directory.Solution.props       |  7 +++++++
 MSBuildProjectCreator.sln      |  1 +
 6 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 Directory.Solution.props

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 4f2d2f6..c7e0578 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -61,29 +61,21 @@ jobs:
 
     - name: Run Unit Tests (.NET Framework)
       if: ${{ matrix.name == 'Windows' }}
-      run: dotnet test --logger trx --no-restore --no-build --framework net472 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net472.binlog"
+      run: dotnet test --no-restore --no-build --framework net472 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net472.binlog"
 
     - name: Run Unit Tests (.NET 6)
       if: ${{ matrix.name != 'MacOS' }}
-      run: dotnet test --logger trx --no-restore --no-build --framework net6.0 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net6.0.binlog"
+      run: dotnet test --no-restore --no-build --framework net6.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net6.0.binlog"
 
     - name: Run Unit Tests (.NET 8)
-      run: dotnet test --logger trx --no-restore --no-build --framework net8.0 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net8.0.binlog"
+      run: dotnet test --no-restore --no-build --framework net8.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net8.0.binlog"
       
     - name: Run Unit Tests (.NET 9)
-      run: dotnet test --logger trx --no-restore --no-build --framework net9.0 /noautorsp "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net9.0.binlog"
-
-    - name: Upload Test Results
-      uses: actions/upload-artifact@v4
-      if: success() || failure()
-      with:
-        name: test-results-${{ matrix.name }}
-        path: '**/TestResults/*.trx'
-        if-no-files-found: error
+      run: dotnet test --no-restore --no-build --framework net9.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net9.0.binlog"
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
-      if: success() || failure()
+      if: success()
       with:
         name: ${{ env.ArtifactsDirectoryName }}-${{ matrix.name }}
         path: ${{ env.ArtifactsDirectoryName }}
diff --git a/.github/workflows/Official.yml b/.github/workflows/Official.yml
index 0a27a48..011360d 100644
--- a/.github/workflows/Official.yml
+++ b/.github/workflows/Official.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
-      if: success() || failure()
+      if: success()
       with:
         name: ${{ env.ArtifactsDirectoryName }}
         path: ${{ env.ArtifactsDirectoryName }}
diff --git a/Directory.Build.props b/Directory.Build.props
index 7bfa458..2837234 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,5 +11,7 @@
     <Nullable>enable</Nullable>
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
     <SignAssembly>true</SignAssembly>
+    <VsTestUseMSBuildOutput>true</VsTestUseMSBuildOutput>
+    <_MSBUILDTLENABLED>1</_MSBUILDTLENABLED>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
index 1d78c01..262abe5 100644
--- a/Directory.Build.rsp
+++ b/Directory.Build.rsp
@@ -2,3 +2,4 @@
 /ConsoleLoggerParameters:Verbosity=Minimal;Summary;ForceNoAlign
 /MaxCPUCount
 /NodeReuse:false
+/TerminalLogger:off
diff --git a/Directory.Solution.props b/Directory.Solution.props
new file mode 100644
index 0000000..4988b1d
--- /dev/null
+++ b/Directory.Solution.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+    <VsTestUseMSBuildOutput>true</VsTestUseMSBuildOutput>
+    <_MSBUILDTLENABLED>1</_MSBUILDTLENABLED>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/MSBuildProjectCreator.sln b/MSBuildProjectCreator.sln
index 1f9b765..f7fed69 100644
--- a/MSBuildProjectCreator.sln
+++ b/MSBuildProjectCreator.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8339FD67
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.rsp = Directory.Build.rsp
 		Directory.Packages.props = Directory.Packages.props
+		Directory.Solution.props = Directory.Solution.props
 		global.json = global.json
 		key.snk = key.snk
 		LICENSE = LICENSE