Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5e3ab7e

Browse files
committed
Merge in 'release/3.1' changes
2 parents 43c387a + e65a46e commit 5e3ab7e

File tree

5 files changed

+69
-4
lines changed

5 files changed

+69
-4
lines changed

eng/Packaging.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
2828
<!-- major.minor.release version of the platforms package we're currently building
2929
Pre-release will be appended during build -->
30-
<PlatformPackageVersion>3.1.10</PlatformPackageVersion>
30+
<PlatformPackageVersion>3.1.11</PlatformPackageVersion>
3131
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
3232
<SkipGenerationCheck>true</SkipGenerationCheck>
3333
<!-- The index check here is used to determine if the assembly is containted in a stable package version.

pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,59 @@
274274
"any",
275275
"base"
276276
],
277+
"alpine.3.16": [
278+
"alpine.3.16",
279+
"alpine.3.15",
280+
"alpine.3.14",
281+
"alpine.3.13",
282+
"alpine.3.12",
283+
"alpine.3.11",
284+
"alpine.3.10",
285+
"alpine.3.9",
286+
"alpine.3.8",
287+
"alpine.3.7",
288+
"alpine.3.6",
289+
"alpine",
290+
"linux-musl",
291+
"linux",
292+
"unix",
293+
"any",
294+
"base"
295+
],
296+
"alpine.3.16-x64": [
297+
"alpine.3.16-x64",
298+
"alpine.3.16",
299+
"alpine.3.15-x64",
300+
"alpine.3.15",
301+
"alpine.3.14-x64",
302+
"alpine.3.14",
303+
"alpine.3.13-x64",
304+
"alpine.3.13",
305+
"alpine.3.12-x64",
306+
"alpine.3.12",
307+
"alpine.3.11-x64",
308+
"alpine.3.11",
309+
"alpine.3.10-x64",
310+
"alpine.3.10",
311+
"alpine.3.9-x64",
312+
"alpine.3.9",
313+
"alpine.3.8-x64",
314+
"alpine.3.8",
315+
"alpine.3.7-x64",
316+
"alpine.3.7",
317+
"alpine.3.6-x64",
318+
"alpine.3.6",
319+
"alpine-x64",
320+
"alpine",
321+
"linux-musl-x64",
322+
"linux-musl",
323+
"linux-x64",
324+
"linux",
325+
"unix-x64",
326+
"unix",
327+
"any",
328+
"base"
329+
],
277330

278331
"alpine.3.6": [
279332
"alpine.3.6",

pkg/Microsoft.NETCore.Platforms/runtime.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@
7777
"alpine.3.14-x64"
7878
]
7979
},
80+
"alpine.3.16": {
81+
"#import": [
82+
"alpine.3.15"
83+
]
84+
},
85+
"alpine.3.16-x64": {
86+
"#import": [
87+
"alpine.3.16",
88+
"alpine.3.15-x64"
89+
]
90+
},
8091
"alpine.3.6": {
8192
"#import": [
8293
"alpine"

pkg/Microsoft.NETCore.Platforms/runtimeGroups.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<RuntimeGroup Include="alpine">
1717
<Parent>linux-musl</Parent>
1818
<Architectures>x64</Architectures>
19-
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15</Versions>
19+
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16</Versions>
2020
</RuntimeGroup>
2121

2222
<RuntimeGroup Include="android">

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,10 @@
204204
"3.1.7",
205205
"3.1.8",
206206
"3.1.9",
207-
"3.1.10"
207+
"3.1.10",
208+
"3.1.11"
208209
],
209-
"BaselineVersion": "3.1.10",
210+
"BaselineVersion": "3.1.11",
210211
"InboxOn": {}
211212
},
212213
"Microsoft.NETCore.Platforms.Future": {

0 commit comments

Comments
 (0)