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

Update .NET 8.0 #14448

Closed
wants to merge 2 commits into from
Closed

Update .NET 8.0 #14448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ecec32
Update .NET 8.0
hishamco Oct 6, 2023
3ce4492
Update github workflows
hishamco Oct 6, 2023
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
10 changes: 5 additions & 5 deletions .github/workflows/functional_all_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- uses: actions/setup-node@v3
with:
node-version: "15"
Expand All @@ -43,7 +43,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac_unit_test_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- uses: actions/checkout@v3
- name: Build and test
run: |
dotnet build -c Release -f net8.0
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
2 changes: 1 addition & 1 deletion .github/workflows/pr_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
node-version: "15"
- name: Build
run: |
dotnet build -c Release -f net8.0
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV
- name: Build
run: |
dotnet build -c Release -f net8.0
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:dev .
docker push orchardproject/orchardcore-cms-linux:dev
- name: Deploy preview docker image for windows
Expand All @@ -73,7 +73,7 @@ jobs:
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:dev .
echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
docker push orchardproject/orchardcore-cms-windows:dev
6 changes: 3 additions & 3 deletions .github/workflows/release_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV
- name: Build
run: |
dotnet build -c Release -f net8.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
dotnet build -c Release -f net7.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
dotnet build -c Release -f net6.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} .
docker push orchardproject/orchardcore-cms-linux:latest
docker push "orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }}"
Expand All @@ -85,7 +85,7 @@ jobs:
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} .
echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
docker push orchardproject/orchardcore-cms-windows:latest
Expand Down
12 changes: 6 additions & 6 deletions src/OrchardCore.Build/Dependencies.AspNetCore.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- TFM used when coding in Visual Studio and when creating templates -->
<!-- All 'template.json' should provide a 'choice' for the default TFM -->
<DefaultTargetFramework>net7.0</DefaultTargetFramework>
<DefaultTargetFramework>net8.0</DefaultTargetFramework>

<!-- TFMs used to build the abstractions and modules, by convention the default TFM is at the first position -->
<!-- In a cross-targeting build, some assets are only copied on the first TFM, by convention the default TFM -->
Expand All @@ -20,13 +20,13 @@
<!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
<!-- Versions are preset for the default TFM (there may be no TFM in an evaluation phase) -->
<PropertyGroup>
<AspNetCorePackagesVersion>7.0.11</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>7.0.11</MicrosoftExtensionsPackagesVersion>
<AspNetCorePackagesVersion>8.0.0-rc.1</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>8.0.0-rc.1</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
<AspNetCorePackagesVersion>6.0.22</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>6.0.22</MicrosoftExtensionsPackagesVersion>
<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
<AspNetCorePackagesVersion>7.0.11</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>7.0.11</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<!-- 'Microsoft.AspNetCore' packages that are not included in the ASP.NET Core shared framework -->
Expand Down
4 changes: 2 additions & 2 deletions test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function deleteDirectory(dir) {
}

// Host the dotnet application, does not rebuild
function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) {
function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) {
if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) {
global.log("Application already built, skipping build");
} else {
Expand Down Expand Up @@ -57,7 +57,7 @@ function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7
}

// combines the functions above, useful when triggering tests from CI
function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) {
function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) {
deleteDirectory(path.join(dir, "App_Data_Tests"));
var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion });

Expand Down
4 changes: 2 additions & 2 deletions test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function deleteDirectory(dir) {
}

// Host the dotnet application, does not rebuild
function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) {
function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) {
if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) {
global.log("Application already built, skipping build");
} else {
Expand Down Expand Up @@ -53,7 +53,7 @@ function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7
}

// combines the functions above, useful when triggering tests from CI
function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) {
function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) {
deleteDirectory(path.join(dir, "App_Data_Tests"));
var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion });

Expand Down
4 changes: 2 additions & 2 deletions test/OrchardCore.Tests.Functional/cypress-commands/src/test-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function deleteDirectory(dir) {
}

// Host the dotnet application, does not rebuild
export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) {
export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) {
if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) {
global.log("Application already built, skipping build");
} else {
Expand Down Expand Up @@ -53,7 +53,7 @@ export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersio
}

// combines the functions above, useful when triggering tests from CI
export function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) {
export function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) {
deleteDirectory(path.join(dir, "App_Data_Tests"));
var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion });

Expand Down
Loading