Skip to content

Commit 91961e7

Browse files
update dotnet8 (#1565)
1 parent b4e69bb commit 91961e7

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

build/windows/Makefile.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# 3. copy the files under installer directory to ..\..\kubernetes\windows\amalogswindows
66
# 4. Builds the livenessprobe cpp and copy the executable to the under directory ..\..\kubernetes\windows\amalogswindows
77

8-
$dotnetcoreframework = "net6.0"
8+
$dotnetcoreframework = "net8.0"
99

1010
Write-Host("Building Certificate generator code...")
1111
$currentdir = $PSScriptRoot
@@ -80,7 +80,7 @@ Write-Host("Successfully added dotnet packages") -ForegroundColor Green
8080
dotnet build -f $dotnetcoreframework
8181
Write-Host("Building Certificate generator code and ...") -ForegroundColor Green
8282

83-
Write-Host("Publish release and win10-x64 binaries of certificate generator code ...")
83+
Write-Host("Publish release and win-x64 binaries of certificate generator code ...")
8484
$isCDPxEnvironment = $false
8585
if (![string]::IsNullOrEmpty([System.Environment]::GetEnvironmentVariable("IsCDPXBuildMachine", "PROCESS")) -or
8686
![string]::IsNullOrEmpty([System.Environment]::GetEnvironmentVariable("IsCDPXBuildMachine", "USER")) -or
@@ -90,14 +90,14 @@ if (![string]::IsNullOrEmpty([System.Environment]::GetEnvironmentVariable("IsCDP
9090
}
9191
if ($isCDPxEnvironment) {
9292
Write-Host("running on CDPX build machine so setting --no-restore since there is no n/w connectivity during build")
93-
dotnet publish -c Release -r win10-x64 --no-restore
93+
dotnet publish -c Release -r win-x64 --self-contained true --no-restore
9494
} else {
95-
dotnet publish -c Release -r win10-x64
95+
dotnet publish -c Release -r win-x64 --self-contained true
9696
}
9797

9898
Write-Host("Successfully published certificate generator code binaries") -ForegroundColor Green
9999

100-
$certreleasebinpath = Join-Path -PATH $certsrcdir -ChildPath "bin\Release\$dotnetcoreframework\win10-x64\publish\*.*"
100+
$certreleasebinpath = Join-Path -PATH $certsrcdir -ChildPath "bin\Release\$dotnetcoreframework\win-x64\publish\*.*"
101101
if ($false -eq (Test-Path -Path $certreleasebinpath)) {
102102
Write-Host("certificate release bin path doesnt exist : " + $certreleasebinpath + " ") -ForegroundColor Red
103103
exit 1

build/windows/installer/certificategenerator/CertificateGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
77
</PropertyGroup>
88

scripts/build/windows/install-build-pre-requisites.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ function Install-DotNetCoreSDK() {
9393
exit 1
9494
}
9595

96-
$url = "https://download.visualstudio.microsoft.com/download/pr/4e88f517-196e-4b17-a40c-2692c689661d/eed3f5fca28262f764d8b650585a7278/dotnet-sdk-3.1.301-win-x64.exe"
97-
$output = Join-Path -Path $dotNetSdkTemp -ChildPath "dotnet-sdk-3.1.301-win-x64.exe"
96+
$url = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-win-x64.exe"
97+
$output = Join-Path -Path $dotNetSdkTemp -ChildPath "dotnet-sdk-8.0.415-win-x64.exe"
9898

99-
Write-Host("downloading .net core sdk 3.1: " + $dotNetSdkTemp + " ...")
99+
Write-Host("downloading .NET 8 SDK: " + $dotNetSdkTemp + " ...")
100100
Invoke-WebRequest -Uri $url -OutFile $output -ErrorAction Stop
101-
Write-Host("downloading .net core sdk 3.1: " + $dotNetSdkTemp + " completed")
101+
Write-Host("downloading .NET 8 SDK: " + $dotNetSdkTemp + " completed")
102102

103-
# install dotNet core sdk
104-
Write-Host("installing .net core sdk 3.1 ...")
103+
# install dotNet sdk
104+
Write-Host("installing .NET 8 SDK ...")
105105
Start-Process -Wait $output -ArgumentList " /q /norestart"
106-
Write-Host("installing .net core sdk 3.1 completed")
106+
Write-Host("installing .NET 8 SDK completed")
107107
}
108108

109109
function Install-Docker() {
@@ -160,7 +160,7 @@ Install-Go
160160
Write-Host "Install Build dependencies"
161161
Build-Dependencies
162162

163-
Write-Host "Install .NET core sdk 3.1"
163+
Write-Host "Install .NET core sdk 8.0"
164164
Install-DotNetCoreSDK
165165

166166
Write-Host "Install Docker"

0 commit comments

Comments
 (0)