From 8ba11765c95a84bbb47bea01fa12ee607020d635 Mon Sep 17 00:00:00 2001
From: Stephen Bonikowsky <stebon@microsoft.com>
Date: Thu, 24 May 2018 10:26:07 -0700
Subject: [PATCH] Update WCF pks and assemblies to stable versions for 2.1
 release.

* Added the feed containing the final packages of dependencies.
---
 dependencies.props             |  15 +-
 dir.props                      |   7 +
 external/corefx/corefx.depproj |  10 +-
 pkg/baseline/packageIndex.json | 268 ++++++++++++++++-----------------
 4 files changed, 154 insertions(+), 146 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index a1dcabdcdae..5a3f5c04b3d 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -21,14 +21,15 @@
   <PropertyGroup>
     <WCFExpectedPrerelease>rtm-26523-01</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>
@@ -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 -->
diff --git a/dir.props b/dir.props
index 79ab525a18d..1cbfb9e7ef4 100644
--- a/dir.props
+++ b/dir.props
@@ -62,6 +62,12 @@
   <!-- 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. -->
@@ -69,6 +75,7 @@
     <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
     -->
diff --git a/external/corefx/corefx.depproj b/external/corefx/corefx.depproj
index 350c84b031f..e444b2ee7a6 100644
--- a/external/corefx/corefx.depproj
+++ b/external/corefx/corefx.depproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Security.AccessControl">
-      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+      <Version>$(CoreFxPkgStableVersion)</Version>
     </PackageReference>
   </ItemGroup>
 
@@ -27,7 +27,7 @@
       <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Composition">
-      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+      <Version>$(CoreFxPkgStableVersion)</Version>
     </PackageReference>
   </ItemGroup>
 
@@ -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>
 
diff --git a/pkg/baseline/packageIndex.json b/pkg/baseline/packageIndex.json
index ec17e78d34c..0c4eefa826e 100644
--- a/pkg/baseline/packageIndex.json
+++ b/pkg/baseline/packageIndex.json
@@ -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": {}
 }