diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 75e06fee6..bb2f97452 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -13,13 +13,20 @@ on: jobs: test-win: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2.3.4 + + - name: Advance Security Compliance Action + uses: GeekMasher/advanced-security-compliance@v1.5 + with: + severity: none + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run tests on Windows for all targets - run: dotnet test -c Release + run: dotnet test -c Release nuget: runs-on: windows-latest diff --git a/.gitignore b/.gitignore index aa786088f..8a9d0faf7 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,10 @@ RestSharp.IntegrationTests/config.json /node_modules/ /out/ /docs/.vuepress/dist/ -.vscode/ \ No newline at end of file +<<<<<<< HEAD + +launch.json +tasks.json +======= +.vscode/ +>>>>>>> d9aaf8e1790c7a8f3a3363bb259cbdeea24982f9 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ba7762fac..3beecb297 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ - +