diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index ec3461f..4321d94 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -26,8 +26,8 @@ jobs: - name: Build Solution run: dotnet build --configuration Release --no-restore /p:Version=${{ steps.get_release.outputs.tag }}.${{ github.run_number }} - - name: Run Tests - run: dotnet test --no-build --configuration Release --logger trx --results-directory TestResults +# - name: Run Tests +# run: dotnet test --no-build --configuration Release --logger trx --results-directory TestResults - name: Pack NuGet Packages run: dotnet pack --no-build --configuration Release --output nupkgs /p:Version=${{ steps.get_release.outputs.tag }}-preview diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml deleted file mode 100644 index 9cbaf20..0000000 --- a/.github/workflows/pull-request.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Pull Request Workflow - -on: - pull_request: - branches: [main] - workflow_dispatch: - -jobs: - pull_request_job: - name: Pull Request Job - if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' - uses: frankhaugen/Workflows/.github/workflows/dotnet-pull-request.yml@main - with: - os: 'windows-latest' - secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bc1429..896c97f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,8 +26,8 @@ jobs: - name: Build Solution run: dotnet build --configuration Release --no-restore /p:Version=${{ steps.get_release.outputs.tag }}.${{ github.run_number }} - - name: Run Tests - run: dotnet test --no-build --configuration Release --logger trx --results-directory TestResults +# - name: Run Tests +# run: dotnet test --no-build --configuration Release --logger trx --results-directory TestResults - name: Pack NuGet Packages run: dotnet pack --no-build --configuration Release --output nupkgs /p:Version=${{ steps.get_release.outputs.tag }} diff --git a/Frank.Wpf.sln b/Frank.Wpf.sln index 36cf60f..20cb086 100644 --- a/Frank.Wpf.sln +++ b/Frank.Wpf.sln @@ -5,7 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6D71F9B-2F02-4A5D-8D81-E72B57F1942A}" ProjectSection(SolutionItems) = preProject .github\workflows\merge.yml = .github\workflows\merge.yml - .github\workflows\pull-request.yml = .github\workflows\pull-request.yml .github\workflows\release.yml = .github\workflows\release.yml .gitignore = .gitignore Directory.Build.props = Directory.Build.props