More CI fixes

MonoGame · Oct 27, 2023 · bf10c8c · bf10c8c
1 parent d11b80f
commit bf10c8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,8 +29,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Restore dotnet tools
-        run: dotnet tool restore
       - name: Run CAKE
         run: dotnet run --project ./build/Build.csproj
       - name: Package artifacts
@@ -48,10 +46,6 @@ jobs:
     needs: [ build ]
     if: ${{ github.event_name == 'push' }}
     steps:
-      - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: '6.0.x'
       - name: Clone repository
         uses: actions/checkout@v4
         with:
@@ -74,7 +68,7 @@ jobs:
       - name: Run CAKE
         run: dotnet run --project ./build/Build.csproj -- "--target=Package"
       - name: Push packages
-        run: dotnet nuget push bin/Release/*.nupkg --source https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json --api-key ${GITHUB_TOKEN}
+        run: dotnet nuget push src/bin/Release/*.nupkg --source https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json --api-key ${GITHUB_TOKEN}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Make a release

diff --git a/build/PackageTask.cs b/build/PackageTask.cs
@@ -14,7 +14,7 @@ public override void Run(BuildContext context)
         dnMsBuildSettings.WithProperty("Version", sdlVersion + "." + context.EnvironmentVariable("GITHUB_RUN_NUMBER"));
         dnMsBuildSettings.WithProperty("RepositoryUrl", "https://github.com/" + context.EnvironmentVariable("GITHUB_REPOSITORY"));
 
-        context.DotNetPack("MonoGame.Library.SDL.csproj", new DotNetPackSettings
+        context.DotNetPack("src/MonoGame.Library.SDL.csproj", new DotNetPackSettings
         {
             MSBuildSettings = dnMsBuildSettings,
             Verbosity = DotNetVerbosity.Minimal,