Skip to content

Commit c757d32

Browse files
authored
Merge pull request #40 from github/v1
v1 - update msdo links
2 parents b9537ae + 786a16a commit c757d32

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

.github/workflows/on-push-verification.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
# Checkout your code repository to scan
1717
- uses: actions/checkout@v2
1818

19-
# Ensure a compatible version of dotnet is installed.
20-
# The [Microsoft Security Code Analysis CLI](https://aka.ms/msca-nuget) is built with dotnet v3.1.201.
21-
# A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
22-
# Remote agents already have a compatible version of dotnet installed and this step may be skipped.
23-
# For local agents, ensure dotnet version 3.1.201 or later is installed by including this action:
19+
# Ensure a compatible version of dotnet is installed.
20+
# The [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) is built with net6.0
21+
# A version greater than or equal to net6.0 of dotnet must be installed on the agent in order to run this action.
22+
# GitHub hosted runners already have a compatible version of dotnet installed and this step may be skipped.
23+
24+
# For self-hosted runners, ensure dotnet version 3.1.201 or later is installed by including this action:
2425
# - uses: actions/setup-dotnet@v1
2526
# with:
26-
# dotnet-version: '3.1.x'
27+
# dotnet-version: '6.0.x'
2728

2829
# Run open source static analysis tools
2930
- name: Run OSSAR

.github/workflows/sample-workflow-ubuntu-latest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ jobs:
2222
- uses: actions/checkout@v2
2323

2424
# Ensure a compatible version of dotnet is installed.
25-
# The [Microsoft Security Code Analysis CLI](https://aka.ms/msca-nuget) is built with dotnet v3.1.201.
26-
# A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
25+
# The [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) is built with net6.0
26+
# A version greater than or equal to net6.0 of dotnet must be installed on the agent in order to run this action.
2727
# GitHub hosted runners already have a compatible version of dotnet installed and this step may be skipped.
28+
2829
# For self-hosted runners, ensure dotnet version 3.1.201 or later is installed by including this action:
2930
# - uses: actions/setup-dotnet@v1
3031
# with:
31-
# dotnet-version: '3.1.x'
32+
# dotnet-version: '6.0.x'
3233

3334
# Run open source static analysis tools
3435
- name: Run OSSAR

.github/workflows/sample-workflow-windows-latest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ jobs:
2222
- uses: actions/checkout@v2
2323

2424
# Ensure a compatible version of dotnet is installed.
25-
# The [Microsoft Security Code Analysis CLI](https://aka.ms/msca-nuget) is built with dotnet v3.1.201.
26-
# A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
25+
# The [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) is built with net6.0
26+
# A version greater than or equal to net6.0 of dotnet must be installed on the agent in order to run this action.
2727
# GitHub hosted runners already have a compatible version of dotnet installed and this step may be skipped.
28+
2829
# For self-hosted runners, ensure dotnet version 3.1.201 or later is installed by including this action:
2930
# - uses: actions/setup-dotnet@v1
3031
# with:
31-
# dotnet-version: '3.1.x'
32+
# dotnet-version: '6.0.x'
3233

3334
# Run open source static analysis tools
3435
- name: Run OSSAR

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The OSSAR action is currently in beta and runs on the `windows-latest` queue, as
1111

1212
# Overview
1313

14-
This action runs the [Microsoft Security Code Analysis CLI](https://aka.ms/msca-nuget) for security analysis by:
14+
This action runs the [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) for security analysis by:
1515

16-
* Installing the Microsoft Security Code Analysis CLI
16+
* Installing the Microsoft Security DevOps CLI
1717
* Installing the latest policy or referencing the local `policy/github.gdnpolicy` file
1818
* Installing the latest open source tools
1919
* Automatic or user-provided configuration of static analysis tools
@@ -53,12 +53,12 @@ steps:
5353
sarif_file: ${{ steps.ossar.outputs.sarifFile }}
5454
```
5555
56-
**Note:** The [Microsoft Security Code Analysis CLI](https://aka.ms/msca-nuget) is built with dotnet v3.1.201. A version greater than or equal to v3.1.201 of dotnet must be installed on the runner in order to run this action. GitHub hosted runners already have a compatible version of dotnet installed. To ensure a compatible version of dotnet is installed on a self-hosted runner, please configure the [actions/setup-dotnet](https://github.com/actions/setup-dotnet) action.
56+
**Note:** The [Microsoft Security DevOps CLI](https://aka.ms/msdo-nuget) is built with net6.0. A version greater than or equal to net6.0 of dotnet must be installed on the runner in order to run this action. GitHub hosted runners already have a compatible version of dotnet installed. To ensure a compatible version of dotnet is installed on a self-hosted runner, please configure the [actions/setup-dotnet](https://github.com/actions/setup-dotnet) action.
5757
5858
```
5959
- uses: actions/setup-dotnet@v1
6060
with:
61-
dotnet-version: '3.1.x'
61+
# dotnet-version: '6.0.x'
6262
```
6363

6464
## Upload Results to the Security tab

policy/github.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<metadata>
44
<id>Microsoft.Security.CodeAnalysis.Policy.GitHub</id>
55
<version>1.1.0</version>
6-
<description>Microsoft Security Code Analysis Policy for GitHub.</description>
6+
<description>Microsoft Security DevOps Policy for GitHub.</description>
77
<authors>Microsoft</authors>
8-
<projectUrl>https://aka.ms/msca-nuget</projectUrl>
8+
<projectUrl>https://aka.ms/msdo-nuget</projectUrl>
99
<language>en-US</language>
1010
<license type="expression">MS-PL</license>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

0 commit comments

Comments
 (0)