Skip to content

Commit 454ae54

Browse files
authored
Update MRTCore to .net 5.0.3 (#703) (#705)
* Update MRTCore to .net 5.0.3 (#703) * Update MRTCore to .net 5.0.3 * Update runtime version * Change task display name
1 parent e9a13e1 commit 454ae54

4 files changed

Lines changed: 48 additions & 3 deletions

File tree

dev/MRTCore/build-mrt.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@ steps:
9494
arguments: '${{ parameters.MRTSourcesDirectory }}'
9595
modifyEnvironment: true
9696

97+
- task: powershell@2
98+
displayName: 'Download .net runtime Windows installer'
99+
inputs:
100+
targetType: filePath
101+
workingDirectory: ${{ parameters.MRTSourcesDirectory }}\build
102+
filePath: ${{ parameters.MRTSourcesDirectory }}\build\DownloadDotNetRuntimeInstaller.ps1
103+
97104
# - task: BatchScript@1
98105
# displayName: 'Debug'
99106
# inputs:
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
$ProgressPreference = "SilentlyContinue"
2+
3+
$arch = $env:_BuildArch;
4+
$buildFavor = "$($env:_BuildArch)$($env:_BuildType)"
5+
$binRoot = $env:BinRoot
6+
7+
$outputDir = Join-Path (Join-Path $binRoot $buildFavor) "TestDependencies"
8+
$outputPath = Join-Path $outputDir "dotnet-windowsdesktop-runtime-installer.exe"
9+
10+
if(!(Test-Path $outputDir))
11+
{
12+
New-Item -ItemType Directory -Path $outputDir | Out-Null
13+
}
14+
15+
# Find direct download links at https://dotnet.microsoft.com/download/dotnet/5.0
16+
$downloadurlx86 = "https://download.visualstudio.microsoft.com/download/pr/a8dcbda1-8720-453c-9ec6-5a9d90935643/28754321a8b966f1ce837e6f59035b48/windowsdesktop-runtime-5.0.3-win-x86.exe"
17+
$downloadurlx64 = "https://download.visualstudio.microsoft.com/download/pr/c6541c87-42f2-4c5d-b6db-2df0dade5e00/13e89a5fec3ddb224cd93dd18b0761ff/windowsdesktop-runtime-5.0.3-win-x64.exe"
18+
19+
if($arch -eq "x86")
20+
{
21+
$downloadurl = $downloadurlx86
22+
}
23+
elseif($arch -eq "amd64")
24+
{
25+
$downloadurl = $downloadurlx64
26+
}
27+
else
28+
{
29+
Write-Host "dotnet Desktop runtime not available for arch $arch"
30+
return
31+
}
32+
33+
34+
if(!(Test-Path $outputPath))
35+
{
36+
Write-Host "Downloading $downloadurl to $outputPath"
37+
Invoke-WebRequest $downloadurl -OutFile $outputPath
38+
}

dev/MRTCore/build/versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<CurrentLiftedIXPPackageVersion>10.0.20170.1001-200713-1000.rs-onecore-dep-ixp1</CurrentLiftedIXPPackageVersion>
2121
<CurrentWilPackageVersion>1.0.190716.2</CurrentWilPackageVersion>
2222
<MuxCustomBuildTasksPackageVersion>1.0.83-winui3</MuxCustomBuildTasksPackageVersion>
23-
<DotNetCoreSdkVersion>5.0.101</DotNetCoreSdkVersion>
24-
<DotNetCoreRuntimeVersion>5.0.1</DotNetCoreRuntimeVersion>
23+
<DotNetCoreSdkVersion>5.0.103</DotNetCoreSdkVersion>
24+
<DotNetCoreRuntimeVersion>5.0.3</DotNetCoreRuntimeVersion>
2525
<DetoursVersion>4.0.1</DetoursVersion>
2626
<CppWinRTVersion>2.0.191217.1</CppWinRTVersion>
2727
<MicrosoftSourceLinkAzureReposVersion>1.0.0</MicrosoftSourceLinkAzureReposVersion>

dev/MRTCore/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.101"
3+
"version": "5.0.103"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets" : "1.0.88"

0 commit comments

Comments
 (0)