Skip to content

Commit 309c77a

Browse files
authored
Merge pull request #93706 from dotnet-maestro-bot/merge/release/6.0-to-release/6.0-staging
[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
2 parents 4fa193e + 4a336b1 commit 309c77a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>6.0.24</ProductVersion>
4+
<ProductVersion>6.0.25</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>6</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>24</PatchVersion>
8+
<PatchVersion>25</PatchVersion>
99
<SdkBandVersion>6.0.400</SdkBandVersion>
1010
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1111
<PreReleaseVersionIteration>

src/libraries/System.Text.Json/src/System.Text.Json.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Nullable>enable</Nullable>
1010
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
1111
<IsPackable>true</IsPackable>
12-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
12+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1313
<ServicingVersion>9</ServicingVersion>
1414
<PackageDescription>Provides high-performance and low-allocating types that serialize objects to JavaScript Object Notation (JSON) text and deserialize JSON text to objects, with UTF-8 support built-in. Also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM), that is read-only, for random access of the JSON elements within a structured view of the data.
1515

0 commit comments

Comments
 (0)