Skip to content

Commit d7b7312

Browse files
authored
update to cswinrt 1.2.1 and .NET 5.0.5 (#715)
* update to cswinrt 1.2.1 and .NET 5.0.5 * syncing with latest dotnet update changes
1 parent 454ae54 commit d7b7312

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

dev/MRTCore/build/DownloadDotNetRuntimeInstaller.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if(!(Test-Path $outputDir))
1313
}
1414

1515
# 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"
16+
$downloadurlx86 = "https://download.visualstudio.microsoft.com/download/pr/c089205d-4f58-4f8d-ad84-c92eaf2f3411/5cd3f9b3bd089c09df14dbbfb64124a4/windowsdesktop-runtime-5.0.5-win-x86.exe"
17+
$downloadurlx64 = "https://download.visualstudio.microsoft.com/download/pr/c1ef0b3f-9663-4fc5-85eb-4a9cadacdb87/52b890f91e6bd4350d29d2482038df1c/windowsdesktop-runtime-5.0.5-win-x64.exe"
1818

1919
if($arch -eq "x86")
2020
{

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.103</DotNetCoreSdkVersion>
24-
<DotNetCoreRuntimeVersion>5.0.3</DotNetCoreRuntimeVersion>
23+
<DotNetCoreSdkVersion>5.0.202</DotNetCoreSdkVersion>
24+
<DotNetCoreRuntimeVersion>5.0.5</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.103"
3+
"version": "5.0.202"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets" : "1.0.88"

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/projection/Microsoft.ApplicationModel.Resources.Projection.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.0" />
11+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.1" />
1212
</ItemGroup>
13-
13+
14+
<!-- For consistency across Reunion, explicitly reference .NET 5.0.5 SDK (5.0.202 train for VS 16.9.3) -->
15+
<ItemGroup>
16+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.15" />
17+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.15" />
18+
</ItemGroup>
19+
1420
<ItemGroup>
1521
<ProjectReference Include="..\src\Microsoft.ApplicationModel.Resources.vcxproj" />
1622
</ItemGroup>

0 commit comments

Comments
 (0)