Skip to content

Commit

Permalink
Merge pull request #1366 from microsoft/manodasanw/fixdotnetversions
Browse files Browse the repository at this point in the history
Update to latest .NET 6 and 7 version.
  • Loading branch information
manodasanW authored Oct 14, 2023
2 parents 179bb06 + c62efe4 commit c7c0b30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions build/AzurePipelineTemplates/CsWinRT-Variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ variables:
PatchVersion: 4
WinRT.Runtime.AssemblyVersion: '2.0.0.0'
Net5.SDK.Feed: 'https://dotnetcli.blob.core.windows.net/dotnet'
Net5.SDK.Version: '5.0.408'
Net6.SDK.Version: '6.0.301'
Net6.SDK.Version: '6.0.415'
NoSamples: 'false'

# This 'coalesce' pattern allows the yml to define a default value for a variable but allows the value to be overridden at queue time.
# E.g. '_IsRelease' defaults to empty string, but if 'IsRelease' is set at queue time that value will be used.

_IsRelease: $[coalesce(variables.IsRelease, '')]
_RunBenchmarks: $[coalesce(variables.RunBenchmarks, 'false')]
_DotNetRuntimeVersion: $[coalesce(variables.DotNetRuntimeVersion, '5.0.17')]
_DotNetRuntimeVersion: $[coalesce(variables.DotNetRuntimeVersion, '6.0.23')]
_WindowsSdkVersionSuffix: $[coalesce(variables.WindowsSdkPackageVersionSuffix, '25')]
_PublishCsWinMD: $[coalesce(variables.PublishCsWinMD, 'false')]
4 changes: 2 additions & 2 deletions src/build.cmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@echo off
if /i "%cswinrt_echo%" == "on" @echo on

set CsWinRTBuildNetSDKVersion=6.0.301
set CsWinRTBuildNet7SDKVersion=7.0.100-preview.7.22377.5
set CsWinRTBuildNetSDKVersion=6.0.415
set CsWinRTBuildNet7SDKVersion=7.0.402
set this_dir=%~dp0

:dotnet
Expand Down

0 comments on commit c7c0b30

Please sign in to comment.