Skip to content

Commit

Permalink
Merge pull request #2899 from StephenBonikowsky/stebon/2.1.0/AddOrche…
Browse files Browse the repository at this point in the history 
…strationFeed

Update WCF pks and assemblies to stable versions for 2.1 release.
  • Loading branch information
@StephenBonikowsky
StephenBonikowsky authored May 25, 2018
2 parents 65c7714 + 8ba1176 commit 12513dc
Show file tree
Hide file tree
Showing 4 changed files with 154 additions and 146 deletions.
15 changes: 8 additions & 7 deletions dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
<PropertyGroup>
<WCFExpectedPrerelease>stable</WCFExpectedPrerelease>
<CoreFxExpectedPrerelease>rtm-26515-03</CoreFxExpectedPrerelease>
<NETStandardPackageVersion>2.0.4-servicing-26522-02</NETStandardPackageVersion>
<NETStandardPackageVersion>2.0.3</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<!--
This property is used for many CoreFX packages, because they have the same
versions. Make more properties for CoreFX if split versions are required.
-->
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm-26515-03</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftPrivateCoreFxUAPPackageVersion>4.6.0-rtm-26515-03</MicrosoftPrivateCoreFxUAPPackageVersion>
<CoreFxPkgStableVersion>4.5.0</CoreFxPkgStableVersion>

<ProjectNTfsExpectedPrerelease>beta-26123-01</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26123-01</ProjectNTfsTestILCExpectedPrerelease>
Expand All @@ -38,16 +39,16 @@
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
<CoreFxBaseLinePackageVersion>2.2.0-rtm-26515-03</CoreFxBaseLinePackageVersion>
<CoreFxBaseLinePackageVersion>2.2.0-rtm</CoreFxBaseLinePackageVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0018</XunitPerfAnalysisPackageVersion>
<XunitNetcoreExtensionsVersion>2.1.0-rc1-02804-05</XunitNetcoreExtensionsVersion>

<CoreClrPackageVersion>2.1.0-rtm-26515-03</CoreClrPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-rtm-26515-03</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-rtm-26515-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<CoreClrPackageVersion>2.1.0-rtm-26515-07</CoreClrPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.0</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0</MicrosoftNETCoreDotNetHostPolicyPackageVersion>

<!-- Microsoft.NETCore.Platforms is part of CoreFX, but allow separate upgrade. -->
<PlatformPackageVersion>2.1.0-rtm-26515-03</PlatformPackageVersion>
<PlatformPackageVersion>2.1.0</PlatformPackageVersion>
</PropertyGroup>

<!-- Package versions used as toolsets -->
Expand Down
7 changes: 7 additions & 0 deletions dir.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,20 @@
<!-- Provides package dependency version properties and verification/auto-upgrade configuration -->
<Import Project="$(MSBuildThisFileDirectory)dependencies.props" />

<!-- Adds an orchestration feed for when packages haven't been published to MyGet -->
<PropertyGroup>
<OrchestrationFeed>"https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json"</OrchestrationFeed>
<ProdConPackageFeedUrl Condition="'$(ProdConPackageFeedUrl)'==''">$(OrchestrationFeed)</ProdConPackageFeedUrl>
</PropertyGroup>

<!-- list of nuget package sources passed to nuget restore -->
<ItemGroup Condition="'$(ExcludeInternetFeeds)' != 'true'">
<!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
<!-- Including buildtools to pull in TestSuite packages and repackaged xunit dependencies-->
<DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
<DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
<DotnetSourceList Include="$(ProdConPackageFeedUrl)" />
<!-- Example to consume local CoreCLR package:
/p:OverridePackageSource=C:\coreclr\bin\Product\Windows_NT.x64.Debug\.nuget\pkg
-->
Expand Down
10 changes: 5 additions & 5 deletions external/corefx/corefx.depproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="System.Security.AccessControl">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
<Version>$(CoreFxPkgStableVersion)</Version>
</PackageReference>
</ItemGroup>

Expand All @@ -27,7 +27,7 @@
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Composition">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
<Version>$(CoreFxPkgStableVersion)</Version>
</PackageReference>
</ItemGroup>

Expand All @@ -41,16 +41,16 @@
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' or
'$(TargetGroup)' == 'netstandard'">
<PackageReference Include="System.Reflection.DispatchProxy">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
<Version>$(CoreFxPkgStableVersion)</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
<Version>$(CoreFxPkgStableVersion)</Version>
</PackageReference>

<PackageReference Include="System.Net.Http.WinHttpHandler"
Condition="'$(TargetsWindows)' == 'true' or
'$(TargetGroup)' == 'netstandard'">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
<Version>$(CoreFxPkgStableVersion)</Version>
</PackageReference>
</ItemGroup>

Expand Down
268 changes: 134 additions & 134 deletions pkg/baseline/packageIndex.json
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,137 @@
{
"Packages": {
"_Comments": {
"_StableVersions": [
"Released versions."
],
"_BaselineVersion": [
"Used to determine the minimum version used for all packages in the repo."
],
"_AssemblyVersionInPackageVersion": [
"Used to understand what version of a package to reference.",
"Then raise the package version of the reference so that its at least the baseline version."
]
"Packages": {
"_Comments": {
"_StableVersions": [
"Released versions."
],
"_BaselineVersion": [
"Used to determine the minimum version used for all packages in the repo."
],
"_AssemblyVersionInPackageVersion": [
"Used to understand what version of a package to reference.",
"Then raise the package version of the reference so that its at least the baseline version."
]
},
"System.Private.ServiceModel": {
"StableVersions": [
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {},
"AssemblyVersionInPackageVersion": {
"4.1.1.0": "4.3.0",
"4.1.1.1": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Duplex": {
"StableVersions": [
"4.0.0",
"4.0.1",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.1.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.1",
"4.1.0.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Http": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.0.10",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.3.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.0.10.0": "4.0.10",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.NetTcp": {
"StableVersions": [
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.3.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Primitives": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.2.1.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.2.0.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Security": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.0.1",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.0.4.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.1",
"4.0.3.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
}
},
"System.Private.ServiceModel": {
"StableVersions": [
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {},
"AssemblyVersionInPackageVersion": {
"4.1.1.0": "4.3.0",
"4.1.1.1": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Duplex": {
"StableVersions": [
"4.0.0",
"4.0.1",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.1.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.1",
"4.1.0.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Http": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.0.10",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.3.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.0.10.0": "4.0.10",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.NetTcp": {
"StableVersions": [
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.1.3.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.1.2.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Primitives": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.1.0",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.2.1.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.1",
"4.2.0.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
},
"System.ServiceModel.Security": {
"StableVersions": [
"3.9.0",
"4.0.0",
"4.0.1",
"4.3.0",
"4.3.1"
],
"BaselineVersion": "4.5.0",
"InboxOn": {
"uap10.0.16299": "4.0.4.0"
},
"AssemblyVersionInPackageVersion": {
"3.9.0.0": "3.9.0",
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.1",
"4.0.3.0": "4.4.0",
"4.5.0.0": "4.5.0"
}
}
},
"ModulesToPackages": {},
"MetaPackages": {}
"ModulesToPackages": {},
"MetaPackages": {}
}

0 comments on commit 12513dc

Please sign in to comment.