Now everything should be fine

Apollo3zehn · Feb 21, 2024 · e22a3f6 · e22a3f6
1 parent ff212d7
commit e22a3f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -36,17 +36,17 @@ jobs:
         run: python build/create_tag_body.py
 
       - name: Build
-        run: dotnet build -c Release src/FluentModbus/FluentModbus.csproj /maxcpucount:1
+        run: dotnet build -c Release src/FluentModbus/FluentModbus.csproj
 
       - name: Test
-        run: dotnet test -c Release /p:BuildProjectReferences=false /maxcpucount:1
+        run: dotnet test -c Release /p:BuildProjectReferences=false
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: |
-            artifacts/packages/
+            artifacts/package/release/
             artifacts/tag_body.txt
 
     outputs:
@@ -70,7 +70,7 @@ jobs:
           path: artifacts
 
       - name: Nuget package (MyGet)
-        run: dotnet nuget push 'artifacts/packages/*.nupkg' --api-key ${MYGET_API_KEY} --source https://www.myget.org/F/apollo3zehn-dev/api/v3/index.json
+        run: dotnet nuget push 'artifacts/package/release/*.nupkg' --api-key ${MYGET_API_KEY} --source https://www.myget.org/F/apollo3zehn-dev/api/v3/index.json
         env:
           MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
 
@@ -96,6 +96,6 @@ jobs:
           body_path: artifacts/tag_body.txt
 
       - name: Nuget package (Nuget)
-        run: dotnet nuget push 'artifacts/packages/*.nupkg' --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json
+        run: dotnet nuget push 'artifacts/package/release/*.nupkg' --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,14 +10,8 @@
     <RestoreAdditionalProjectSources>
       https://www.myget.org/F/apollo3zehn-dev/api/v3/index.json
     </RestoreAdditionalProjectSources>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ArtifactsPath>$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory)artifacts))</ArtifactsPath>
-    <BaseIntermediateOutputPath>$(ArtifactsPath)/obj/$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)/$(Configuration)</IntermediateOutputPath>
-    <OutputPath>$(ArtifactsPath)/bin/$(MSBuildProjectName)/$(Configuration)</OutputPath>
-    <PackageOutputPath>$(ArtifactsPath)/packages</PackageOutputPath>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
   </PropertyGroup>
 
 </Project>