-
-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'unable-to-locate-bom-ref-logging' of https://github.com…
…/shawner18/cyclonedx-dotnet into unable-to-locate-bom-ref-logging
- Loading branch information
Showing
30 changed files
with
617 additions
and
198 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
FROM ubuntu:22.04 | ||
|
||
RUN apt-get install -y --no-install-recommends wget=2.0.1 | ||
RUN apt-get install -y --no-install-recommends apt-transport-https=2.5.6 | ||
RUN curl -o ./packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb | ||
RUN dpkg -i packages-microsoft-prod.deb | ||
RUN apt-get install -y --no-install-recommends dotnet-sdk-7.0=7.0 | ||
RUN rm -rf /var/lib/apt/lists/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,15 +16,12 @@ jobs: | |
runs-on: ubuntu-latest | ||
timeout-minutes: 30 | ||
steps: | ||
- uses: actions/checkout@v3.1.0 | ||
- name: Setup dotnet 3.1 | ||
- uses: actions/checkout@v3.5.2 | ||
- name: Setup dotnet | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: '3.1.x' | ||
- name: Setup dotnet 6 | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: '6.x' | ||
dotnet-version: | | ||
7.x | ||
- name: Build | ||
run: dotnet build /WarnAsError | ||
|
||
|
@@ -46,15 +43,15 @@ jobs: | |
strategy: | ||
matrix: | ||
os: [ubuntu-latest, windows-latest, macos-latest] | ||
framework: ['netcoreapp3.1','net6.0'] | ||
framework: ['net6.0','net7.0'] | ||
timeout-minutes: 30 | ||
|
||
steps: | ||
- uses: actions/checkout@v3.1.0 | ||
- name: Setup dotnet 3.1 | ||
- uses: actions/checkout@v3.5.2 | ||
- name: Setup dotnet 7 | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: '3.1.x' | ||
dotnet-version: '7.x' | ||
- name: Setup dotnet 6 | ||
uses: actions/[email protected] | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
# | ||
# For an example commit browse to | ||
# https://github.com/CycloneDX/cyclonedx-dotnet/commit/d110af854371374460430bb8438225a7d7a84274. | ||
# | ||
# | ||
# The resulting release is here | ||
# https://github.com/CycloneDX/cyclonedx-dotnet/releases/tag/v1.0.0. | ||
# | ||
|
@@ -28,19 +28,16 @@ jobs: | |
runs-on: ubuntu-latest | ||
timeout-minutes: 30 | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Setup dotnet 3.1 | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: '3.1.x' | ||
- name: Setup dotnet 6 | ||
- uses: actions/[email protected] | ||
- name: Setup dotnet | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: '6.x' | ||
|
||
dotnet-version: | | ||
7.x | ||
# The tests should have already been run during the PR workflow, so this is really just a sanity check | ||
- name: Tests | ||
run: dotnet test --framework net6.0 | ||
run: dotnet test --framework net7.0 | ||
|
||
# Build and package everything, including the Docker image | ||
- name: Package release | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.