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

Commit 9b5053f

Browse files
committed
Merge in 'release/2.2' changes
2 parents 4233b72 + e2f63cd commit 9b5053f

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<PropertyGroup>
66
<HarvestStablePackage>false</HarvestStablePackage>
7-
<PackageVersion>2.1.0</PackageVersion>
8-
<ServiceModelVersion>4.4.1</ServiceModelVersion>
7+
<PackageVersion>2.1.1</PackageVersion>
8+
<ServiceModelVersion>4.5.3</ServiceModelVersion>
99
</PropertyGroup>
1010

1111
<ItemDefinitionGroup>

pkg/Microsoft.Windows.Compatibility/externalIndex.json

+11-6
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,41 @@
44
"StableVersions": [
55
"4.4.0",
66
"4.3.0",
7-
"4.4.1"
7+
"4.4.1",
8+
"4.5.3"
89
]
910
},
1011
"System.ServiceModel.Duplex": {
1112
"StableVersions": [
1213
"4.4.0",
1314
"4.3.0",
14-
"4.4.1"
15+
"4.4.1",
16+
"4.5.3"
1517
]
1618
},
1719
"System.ServiceModel.Http": {
1820
"StableVersions": [
1921
"4.4.0",
2022
"4.3.0",
21-
"4.4.1"
23+
"4.4.1",
24+
"4.5.3"
2225
]
2326
},
2427
"System.ServiceModel.NetTcp": {
2528
"StableVersions": [
2629
"4.4.0",
2730
"4.3.0",
28-
"4.4.1"
31+
"4.4.1",
32+
"4.5.3"
2933
]
3034
},
3135
"System.ServiceModel.Security": {
3236
"StableVersions": [
3337
"4.4.0",
3438
"4.3.0",
35-
"4.4.1"
39+
"4.4.1",
40+
"4.5.3"
3641
]
3742
}
3843
}
39-
}
44+
}

src/packages.builds

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<Project Include="$(MSBuildThisFileDirectory)System.Data.SqlClient\pkg\System.Data.SqlClient.pkgproj">
3636
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
3737
</Project>
38+
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
39+
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
40+
</Project>
3841
</ItemGroup>
3942

4043
<!-- Need the PackageIndexFile file property from baseline.props -->

0 commit comments

Comments
 (0)