Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to .NET 8.0 #506

Merged
merged 19 commits into from
Jan 9, 2024
Merged

Upgrade to .NET 8.0 #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ca0b1b8
Upgrade to .NET 8.0
mocsharp Dec 15, 2023
c8320b0
Upgrade CI to use .NET 8
mocsharp Dec 15, 2023
952e3d2
Upgrade Dockerfile to .NET 8
mocsharp Dec 15, 2023
da29917
Update dependencies & remove older version of .NET
mocsharp Dec 20, 2023
204c313
Fix payload assembler default timeout
mocsharp Jan 2, 2024
8c6ee0f
Update MONAI Deploy dependencies
mocsharp Jan 3, 2024
1bdba43
Fix warnings
mocsharp Jan 3, 2024
905a3af
Fix warnings
mocsharp Jan 4, 2024
2786568
Fix warnings
mocsharp Jan 4, 2024
ee78579
Update MONAI Deploy libs
mocsharp Jan 4, 2024
14e8f28
Remove unneeded depends
mocsharp Jan 4, 2024
08aed4b
Update licenses
mocsharp Jan 4, 2024
715221c
Fix unit test
mocsharp Jan 4, 2024
e6c4c22
Merge branch 'vchang/net8' of https://github.com/Project-MONAI/monai-…
mocsharp Jan 4, 2024
d734787
Update depends
mocsharp Jan 5, 2024
009e0e2
Use .net 8
mocsharp Jan 5, 2024
42f3ed4
Update licenses
mocsharp Jan 5, 2024
63e76ed
FIx sonar cloud reported bugs to dispose CTS
mocsharp Jan 5, 2024
eeddc9f
Ignore third-party code copyright check
mocsharp Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/[email protected]
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable Homebrew
run: echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/[email protected]
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: find ~+ -type f -name "*.Test.csproj" | xargs -L1 dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal -r "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings
run: find ~+ -type f -name "*.Test.csproj" | xargs -L1 dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal --results-directory "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings
working-directory: ./src

- name: End SonarScanner
Expand All @@ -244,7 +244,7 @@ jobs:
- uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: "src/${{ env.TEST_RESULTS }}"
directory: "src/"
files: "**/coverage.opencover.xml"
flags: unittests
name: codecov-umbrella
Expand All @@ -270,7 +270,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/[email protected]
Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/[email protected]
Expand Down Expand Up @@ -474,7 +474,7 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/[email protected]
Expand Down Expand Up @@ -539,7 +539,7 @@ jobs:
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"
source-url: https://nuget.pkg.github.com/Project-MONAI/index.json

- name: Publish to GitHub
Expand Down Expand Up @@ -572,7 +572,7 @@ jobs:
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"
source-url: https://nuget.pkg.github.com/Project-MONAI/index.json

- name: Publish to GitHub
Expand Down
1 change: 1 addition & 0 deletions .licenserc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ header:
- 'tests/Integration.Test/*.dev'
- 'tests/Integration.Test/data/**'
- 'guidelines/diagrams/*.txt'
- 'src/DicomWebClient/Third-party/**'

comment: on-failure

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM mcr.microsoft.com/dotnet/sdk:6.0-focal as build
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy as build

# Install the tools
RUN dotnet tool install --tool-path /tools dotnet-trace
Expand All @@ -26,7 +26,7 @@ RUN echo "Building MONAI Deploy Informatics Gateway..."
RUN dotnet publish -c Release -o out --nologo src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy

# Enable elastic client compatibility mode
ENV ELASTIC_CLIENT_APIVERSIONING=true
Expand Down
Loading
Loading