Skip to content

Commit 4c76ca6

Browse files
ericstjStephenBonikowsky
authored andcommitted
Switch to using packageIndex instead of lists
1 parent 0735159 commit 4c76ca6

File tree

4 files changed

+87
-69
lines changed

4 files changed

+87
-69
lines changed

pkg/baseline/baseline.packages.props

Lines changed: 0 additions & 28 deletions
This file was deleted.

pkg/baseline/baseline.props

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="stable.packages.props" />
3-
<Import Project="baseline.packages.props" />
4-
52
<PropertyGroup>
63
<CoreFxBaseLinePackageName>Microsoft.Private.PackageBaseline</CoreFxBaseLinePackageName>
4+
<!-- TODO: Move this back to 1.0.1 once https://github.com/dotnet/corefx/commit/63a868365904c6fbae18a3800c0b908b0f0944af is in -->
75
<CoreFxBaseLinePackageVersion>4.3.0-$(CoreFxExpectedPrerelease)</CoreFxBaseLinePackageVersion>
86
<!-- NuGet doesn't currently write out the versionless props/targets for this, so manually pull it in from packages folder -->
97
<CoreFxBaseLinePackageProps Condition="'$(CoreFxBaseLinePackageProps)' == ''">$(PackagesDir)$(CoreFxBaseLinePackageName)/$(CoreFxBaseLinePackageVersion)/build/$(CoreFxBaseLinePackageName).props</CoreFxBaseLinePackageProps>
8+
9+
<PackageIndexFile>$(MSBuildThisFileDirectory)\packageIndex.json</PackageIndexFile>
1010
</PropertyGroup>
1111

12+
<ItemGroup>
13+
<PackageIndex Include="$(PackageIndexFile)" />
14+
</ItemGroup>
15+
1216
<!-- bring in common baseline -->
1317
<Import Condition="Exists('$(CoreFxBaseLinePackageProps)')" Project="$(CoreFxBaseLinePackageProps)" />
1418

pkg/baseline/packageIndex.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"Packages": {
3+
"System.Private.ServiceModel": {
4+
"StableVersions": [
5+
"4.0.0",
6+
"4.1.0"
7+
],
8+
"BaselineVersion": "4.1.0"
9+
},
10+
"System.ServiceModel.Duplex": {
11+
"StableVersions": [
12+
"4.0.0",
13+
"4.0.1"
14+
],
15+
"BaselineVersion": "4.0.1",
16+
"AssemblyVersionInPackageVersion": {
17+
"4.0.0.0": "4.0.0",
18+
"4.0.1.0": "4.0.1",
19+
"4.0.2.0": "4.0.2"
20+
}
21+
},
22+
"System.ServiceModel.Http": {
23+
"StableVersions": [
24+
"3.9.0",
25+
"4.0.0",
26+
"4.0.10",
27+
"4.1.0"
28+
],
29+
"BaselineVersion": "4.1.0",
30+
"AssemblyVersionInPackageVersion": {
31+
"3.9.0.0": "3.9.0",
32+
"4.0.0.0": "4.0.0",
33+
"4.0.10.0": "4.0.10",
34+
"4.1.0.0": "4.1.0",
35+
"4.1.1.0": "4.1.1"
36+
}
37+
},
38+
"System.ServiceModel.NetTcp": {
39+
"StableVersions": [
40+
"4.0.0",
41+
"4.1.0"
42+
],
43+
"BaselineVersion": "4.1.0",
44+
"AssemblyVersionInPackageVersion": {
45+
"4.0.0.0": "4.0.0",
46+
"4.1.0.0": "4.1.0",
47+
"4.1.1.0": "4.1.1"
48+
}
49+
},
50+
"System.ServiceModel.Primitives": {
51+
"StableVersions": [
52+
"3.9.0",
53+
"4.0.0",
54+
"4.1.0"
55+
],
56+
"BaselineVersion": "4.1.0",
57+
"AssemblyVersionInPackageVersion": {
58+
"3.9.0.0": "3.9.0",
59+
"4.0.0.0": "4.0.0",
60+
"4.1.0.0": "4.1.0",
61+
"4.1.1.0": "4.1.1"
62+
}
63+
},
64+
"System.ServiceModel.Security": {
65+
"StableVersions": [
66+
"3.9.0",
67+
"4.0.0",
68+
"4.0.1"
69+
],
70+
"BaselineVersion": "4.0.1",
71+
"AssemblyVersionInPackageVersion": {
72+
"3.9.0.0": "3.9.0",
73+
"4.0.0.0": "4.0.0",
74+
"4.0.1.0": "4.0.1",
75+
"4.0.2.0": "4.0.2"
76+
}
77+
}
78+
},
79+
"ModulesToPackages": {}
80+
}

pkg/baseline/stable.packages.props

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)