diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml index 36a961369..33c362ca0 100644 --- a/.github/workflows/validate_pull_request.yml +++ b/.github/workflows/validate_pull_request.yml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v3 - run: | + rm -r -f /Tests/CSharpier.MsBuild.Test dotnet tool restore dotnet csharpier . --check test_msbuild: @@ -33,5 +34,5 @@ jobs: - uses: actions/setup-dotnet@v3 - run: | dotnet pack Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj -o nupkg /p:Version=0.0.1 - dotnet build Src/Tests/CSharpier.MsBuild.Test + dotnet build Tests/CSharpier.MsBuild.Test diff --git a/Tests/CSharpier.MsBuild.Test/Dockerfile b/Tests/CSharpier.MsBuild.Test/Dockerfile index 265701c7a..8d8855cbb 100644 --- a/Tests/CSharpier.MsBuild.Test/Dockerfile +++ b/Tests/CSharpier.MsBuild.Test/Dockerfile @@ -1,10 +1,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base -COPY - COPY nupkg ./nupkg -COPY Src/CSharpier.MsBuild.Test ./Src/CSharpier.MsBuild.Test - -WORKDIR Src/CSharpier.MsBuild.Test +COPY global.json ./global.json +COPY Tests/CSharpier.MsBuild.Test ./Tests/CSharpier.MsBuild.Test -RUN dotnet build -c Release +RUN dotnet build Tests/CSharpier.MsBuild.Test -c Release diff --git a/Tests/CSharpier.MsBuild.Test/nuget.config b/Tests/CSharpier.MsBuild.Test/nuget.config index 3f989b9af..9d306ac8c 100644 --- a/Tests/CSharpier.MsBuild.Test/nuget.config +++ b/Tests/CSharpier.MsBuild.Test/nuget.config @@ -1,6 +1,7 @@ - + + \ No newline at end of file