Skip to content

Commit 66ccfaf

Browse files
committed
Merge in 'release/6.0' changes
2 parents d774aef + e746950 commit 66ccfaf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>
256256
<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
257257
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
258-
<IsPrerelease>true</IsPrerelease>
258+
<IsPrerelease>false</IsPrerelease>
259259
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
260260
<!-- Private packages should not be stable -->
261261
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>

eng/native/configureplatform.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
22

33
# If set, indicates that this is not an officially supported release
44
# Keep in sync with IsPrerelease in Directory.Build.props
5-
set(PRERELEASE 1)
5+
set(PRERELEASE 0)
66

77
#----------------------------------------
88
# Detect and set platform variable names

0 commit comments

Comments
 (0)